Move the socket initialization to outer scope.

This guarentees that socket is not null.

1 files changed, 4 insertions, 8 deletions

diff --git a/org.jacoco.ant/src/org/jacoco/ant/DumpTask.java b/org.jacoco.ant/src/org/jacoco/ant/DumpTask.java
index 6fa51fc8..f3820acc 100644
--- a/org.jacoco.ant/src/org/jacoco/ant/DumpTask.java
+++ b/org.jacoco.ant/src/org/jacoco/ant/DumpTask.java
@@ -130,13 +130,12 @@ public class DumpTask extends Task {
 		}
 
 		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(
@@ -151,9 +150,7 @@ public class DumpTask extends Task {
 				remoteReader.read();
 
 			} finally {
-				if (socket != null) {
-					socket.close();
-				}
+				socket.close();
 			}
 
 			// 3. Write execution data to file
@@ -163,7 +160,6 @@ public class DumpTask extends Task {
 				loader.save(destfile, append);
 			}
 
-			socket.close();
 
 		} catch (final IOException e) {
 			throw new BuildException("Unable to dump coverage data", e,