https://bugs.eclipse.org/312929

2 files changed, 3 insertions, 4 deletions

diff --git a/ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntDebugTarget.java b/ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntDebugTarget.java
index a320843..0d55ca8 100644
--- a/ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntDebugTarget.java
+++ b/ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/AntDebugTarget.java
@@ -337,13 +337,12 @@ public class AntDebugTarget extends AntDebugElement implements IDebugTarget, IDe
 	/**
 	 * Called when this debug target terminates.
 	 */
-	public void terminated() {
+	public synchronized void terminated() {
 		if(!fTerminated) {
 			fThreads= new IThread[0];
 			fTerminated = true;
 			fSuspended = false;
 			fController.terminate();
-			fController = null;
 			if (DebugPlugin.getDefault() != null) {
 				DebugPlugin.getDefault().getBreakpointManager().removeBreakpointListener(this);
 				DebugPlugin.getDefault().removeDebugEventListener(this);
diff --git a/ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/RemoteAntDebugBuildListener.java b/ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/RemoteAntDebugBuildListener.java
index b13a14b..b29c513 100644
--- a/ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/RemoteAntDebugBuildListener.java
+++ b/ant/org.eclipse.ant.launching/src/org/eclipse/ant/internal/launching/debug/model/RemoteAntDebugBuildListener.java
@@ -177,10 +177,10 @@ public class RemoteAntDebugBuildListener extends RemoteAntBuildListener implemen
 	 * @param request debug command
 	 */
 	protected void sendRequest(String request) {
-		if (fRequestSocket == null) {
+		if (fRequestWriter == null) {
 			return;
 		}
-		synchronized (fRequestSocket) {
+		synchronized (fRequestWriter) {
 			fRequestWriter.println(request);
 		}		
 	}