From ec56e7f86ceab3db230ab4472526e006ece5d942 Mon Sep 17 00:00:00 2001
From: pivovarit <gpiwowarek@gmail.com>
Date: Sun, 4 Dec 2016 10:04:53 +0100
Subject: [PATCH 1/2] Fix AsyncEchoTest

---
 .../java/com/baeldung/java/nio2/async/AsyncEchoClient.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core-java/src/test/java/com/baeldung/java/nio2/async/AsyncEchoClient.java b/core-java/src/test/java/com/baeldung/java/nio2/async/AsyncEchoClient.java
index 576d1f7a3f..227750047a 100644
--- a/core-java/src/test/java/com/baeldung/java/nio2/async/AsyncEchoClient.java
+++ b/core-java/src/test/java/com/baeldung/java/nio2/async/AsyncEchoClient.java
@@ -56,6 +56,7 @@ public class AsyncEchoClient {
             readResult.get();
         } catch (Exception e) {
             e.printStackTrace();
+        }
         String echo = new String(buffer.array()).trim();
         buffer.clear();
         return echo;
@@ -73,7 +74,7 @@ public class AsyncEchoClient {
         AsyncEchoClient client = AsyncEchoClient.getInstance();
         client.start();
         BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
-        String line = null;
+        String line;
         System.out.println("Message to server:");
         while ((line = br.readLine()) != null) {
             String response = client.sendMessage(line);

From 19e7ab40e46cdc296079c4c11f5b5cbdf816c0b1 Mon Sep 17 00:00:00 2001
From: pivovarit <gpiwowarek@gmail.com>
Date: Sun, 4 Dec 2016 10:40:38 +0100
Subject: [PATCH 2/2] Fix HtmlUnitAndJUnitTest

---
 .../java/com/baeldung/htmlunit/HtmlUnitAndJUnitTest.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/spring-mvc-java/src/test/java/com/baeldung/htmlunit/HtmlUnitAndJUnitTest.java b/spring-mvc-java/src/test/java/com/baeldung/htmlunit/HtmlUnitAndJUnitTest.java
index 8395a49581..46a95ae694 100644
--- a/spring-mvc-java/src/test/java/com/baeldung/htmlunit/HtmlUnitAndJUnitTest.java
+++ b/spring-mvc-java/src/test/java/com/baeldung/htmlunit/HtmlUnitAndJUnitTest.java
@@ -1,13 +1,16 @@
 package com.baeldung.htmlunit;
 
-import org.junit.Assert;
-import org.junit.Test;
-
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 public class HtmlUnitAndJUnitTest {
 
+	private WebClient webClient;
+
 	@Before
 	public void init() throws Exception {
 	    webClient = new WebClient();