From 393106be61f10c2f8607fa843c2b766419e1db8c Mon Sep 17 00:00:00 2001
From: Alex Theedom <alex.theedom@gmail.com>
Date: Thu, 25 Aug 2016 22:07:52 +0100
Subject: [PATCH] Remove nulls

---
 sockets/src/main/java/com/baeldung/socket/EchoClient.java | 6 +++---
 .../main/java/com/baeldung/socket/EchoMultiServer.java    | 6 +++---
 sockets/src/main/java/com/baeldung/socket/EchoServer.java | 8 ++++----
 .../src/main/java/com/baeldung/socket/GreetClient.java    | 6 +++---
 .../src/main/java/com/baeldung/socket/GreetServer.java    | 8 ++++----
 sockets/src/test/java/com/baeldung/socket/EchoTest.java   | 2 +-
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/sockets/src/main/java/com/baeldung/socket/EchoClient.java b/sockets/src/main/java/com/baeldung/socket/EchoClient.java
index 54fcea3d51..e8ec97c80a 100644
--- a/sockets/src/main/java/com/baeldung/socket/EchoClient.java
+++ b/sockets/src/main/java/com/baeldung/socket/EchoClient.java
@@ -4,9 +4,9 @@ import java.io.*;
 import java.net.*;
 
 public class EchoClient {
-	private Socket clientSocket = null;
-	private PrintWriter out = null;
-	private BufferedReader in = null;
+	private Socket clientSocket;
+	private PrintWriter out;
+	private BufferedReader in;
 
 	public void startConnection(String ip, int port) {
 		try {
diff --git a/sockets/src/main/java/com/baeldung/socket/EchoMultiServer.java b/sockets/src/main/java/com/baeldung/socket/EchoMultiServer.java
index a02cf6ef3e..2ece1ceebe 100644
--- a/sockets/src/main/java/com/baeldung/socket/EchoMultiServer.java
+++ b/sockets/src/main/java/com/baeldung/socket/EchoMultiServer.java
@@ -4,7 +4,7 @@ import java.net.*;
 import java.io.*;
 
 public class EchoMultiServer {
-	private ServerSocket serverSocket = null;
+	private ServerSocket serverSocket;
 
 	public void start(int port) {
 		try {
@@ -32,8 +32,8 @@ public class EchoMultiServer {
 
 	private static class EchoClientHandler extends Thread {
 		private Socket clientSocket;
-		private PrintWriter out = null;
-		private BufferedReader in = null;
+		private PrintWriter out;
+		private BufferedReader in;
 
 		public EchoClientHandler(Socket socket) {
 			this.clientSocket = socket;
diff --git a/sockets/src/main/java/com/baeldung/socket/EchoServer.java b/sockets/src/main/java/com/baeldung/socket/EchoServer.java
index 45eccb6b0d..3607afa7f5 100644
--- a/sockets/src/main/java/com/baeldung/socket/EchoServer.java
+++ b/sockets/src/main/java/com/baeldung/socket/EchoServer.java
@@ -4,10 +4,10 @@ import java.net.*;
 import java.io.*;
 
 public class EchoServer {
-	private ServerSocket serverSocket = null;
-	private Socket clientSocket = null;
-	private PrintWriter out = null;
-	private BufferedReader in = null;
+	private ServerSocket serverSocket;
+	private Socket clientSocket;
+	private PrintWriter out;
+	private BufferedReader in;
 
 	public void start(int port) {
 		try {
diff --git a/sockets/src/main/java/com/baeldung/socket/GreetClient.java b/sockets/src/main/java/com/baeldung/socket/GreetClient.java
index 09f94a0bfc..7252827c87 100644
--- a/sockets/src/main/java/com/baeldung/socket/GreetClient.java
+++ b/sockets/src/main/java/com/baeldung/socket/GreetClient.java
@@ -7,9 +7,9 @@ import java.io.PrintWriter;
 import java.net.Socket;
 
 public class GreetClient {
-	private Socket clientSocket = null;
-	private PrintWriter out = null;
-	private BufferedReader in = null;
+	private Socket clientSocket;
+	private PrintWriter out;
+	private BufferedReader in;
 
 	public void startConnection(String ip, int port) {
 		try {
diff --git a/sockets/src/main/java/com/baeldung/socket/GreetServer.java b/sockets/src/main/java/com/baeldung/socket/GreetServer.java
index 7595bddd02..8bf675c7b9 100644
--- a/sockets/src/main/java/com/baeldung/socket/GreetServer.java
+++ b/sockets/src/main/java/com/baeldung/socket/GreetServer.java
@@ -4,10 +4,10 @@ import java.net.*;
 import java.io.*;
 
 public class GreetServer {
-	private ServerSocket serverSocket = null;
-	private Socket clientSocket = null;
-	private PrintWriter out = null;
-	private BufferedReader in = null;
+	private ServerSocket serverSocket;
+	private Socket clientSocket;
+	private PrintWriter out;
+	private BufferedReader in;
 
 
 	public void start(int port) {
diff --git a/sockets/src/test/java/com/baeldung/socket/EchoTest.java b/sockets/src/test/java/com/baeldung/socket/EchoTest.java
index 6fefb907e2..0f0c02e4d8 100644
--- a/sockets/src/test/java/com/baeldung/socket/EchoTest.java
+++ b/sockets/src/test/java/com/baeldung/socket/EchoTest.java
@@ -2,8 +2,8 @@ package com.baeldung.socket;
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
+
 import java.util.concurrent.Executors;
 
 import static org.junit.Assert.assertEquals;