Move the socket initialization to outer scope.

This guarentees that socket is not null.

1 files changed, 3 insertions, 7 deletions

diff --git a/jacoco-maven-plugin/src/org/jacoco/maven/DumpMojo.java b/jacoco-maven-plugin/src/org/jacoco/maven/DumpMojo.java
index 885e450a..bd424656 100644
--- a/jacoco-maven-plugin/src/org/jacoco/maven/DumpMojo.java
+++ b/jacoco-maven-plugin/src/org/jacoco/maven/DumpMojo.java
@@ -103,11 +103,9 @@ public class DumpMojo extends AbstractJacocoMojo {
 		try {
 			final ExecFileLoader loader = new ExecFileLoader();
 
-			Socket socket = null;
+			final Socket socket = tryConnect();
 			try {
-
-				// 1. Open socket connection
-				socket = tryConnect();
+				// 1. Get streams from socket
 				final RemoteControlWriter remoteWriter = new RemoteControlWriter(
 						socket.getOutputStream());
 				final RemoteControlReader remoteReader = new RemoteControlReader(
@@ -122,9 +120,7 @@ public class DumpMojo extends AbstractJacocoMojo {
 				remoteReader.read();
 
 			} finally {
-				if (socket != null) {
-					socket.close();
-				}
+				socket.close();
 			}
 
 			// 3. Write execution data to file