Fixed Trigger point disabled automatically (#667)

The trigger point is being disabled during debugging when a conditional
breakpoint is hit.

Fixes: #546

Author: subyssurendran666

org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/TriggerPointBreakpointsTests.java

@@ -13,8 +13,11 @@
  *******************************************************************************/
 package org.eclipse.jdt.debug.tests.breakpoints;
 
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.model.IBreakpoint;
 import org.eclipse.debug.core.model.IVariable;
 import org.eclipse.jdt.debug.core.IJavaBreakpoint;
+import org.eclipse.jdt.debug.core.IJavaDebugTarget;
 import org.eclipse.jdt.debug.core.IJavaLineBreakpoint;
 import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
 import org.eclipse.jdt.debug.core.IJavaStackFrame;
@@ -135,4 +138,33 @@ public void testTriggerPointBreakpointWithResumeAndConditionAsTrue() throws Exce
 			removeAllBreakpoints();
 		}
 	}
+
+	// see bug : https://github.com/eclipse-jdt/eclipse.jdt.debug/issues/546
+	public void testTriggerPointAutoEnableAfterConditionalBp() throws Exception {
+		String typeName = "TriggerPoint_01";
+		IJavaLineBreakpoint bp1 = createLineBreakpoint(20, typeName);
+		IJavaLineBreakpoint bp2 = createLineBreakpoint(21, typeName);
+		bp1.setTriggerPoint(true);
+		bp2.setCondition("true");
+		bp2.setConditionEnabled(true);
+		bp2.setConditionSuspendOnTrue(true);
+		IJavaThread thread = null;
+		try {
+			thread = launchToBreakpoint(typeName);
+			IJavaStackFrame frame = (IJavaStackFrame) thread.getTopStackFrame();
+			int lineNumber = frame.getLineNumber();
+			assertEquals("Breakpoint should hit at triggeroint", 20, lineNumber);
+			IJavaDebugTarget debugTarget = (IJavaDebugTarget) thread.getDebugTarget();
+			ILaunch launch = debugTarget.getLaunch();
+			thread.getLaunch().terminate();
+			Thread.sleep(3000);
+			IBreakpoint[] bps = getBreakpointManager().getBreakpoints();
+			boolean enabledStatus = bps[0].isEnabled();
+			assertTrue("Trigger point should be enabled after termination", enabledStatus);
+			getLaunchManager().removeLaunch(launch);
+		} finally {
+			terminateAndRemove(thread);
+			removeAllBreakpoints();
+		}
+	}
 }

org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java

@@ -1480,9 +1480,15 @@ private boolean handleSuspendForBreakpointInternal(JavaBreakpoint breakpoint) {
 						return true;
 					}
 				}
-				DebugPlugin.getDefault().getBreakpointManager().enableTriggerPoints(null, false);
-					// make a note that we auto-disabled the trigger point for this breakpoint.
-					// we re enable it at cleanup of JDITarget
+				try {
+					if (breakpoint.isTriggerPoint()) {
+						DebugPlugin.getDefault().getBreakpointManager().enableTriggerPoints(null, false);
+						// make a note that we auto-disabled the trigger point for this breakpoint.
+						// we re enable it at cleanup of JDITarget
+					}
+				} catch (CoreException e) {
+					logError(e);
+				}
 			}
 		}