diff --git a/java/debugger.jpda.ui/nbproject/project.xml b/java/debugger.jpda.ui/nbproject/project.xml
index ecd74d3025b8..b30a6952b4d5 100644
--- a/java/debugger.jpda.ui/nbproject/project.xml
+++ b/java/debugger.jpda.ui/nbproject/project.xml
@@ -343,6 +343,23 @@
<code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
</test-dependency>
</test-type>
+ <test-type>
+ <name>unit</name>
+ <test-dependency>
+ <code-name-base>org.netbeans.libs.junit4</code-name-base>
+ <compile-dependency/>
+ </test-dependency>
+ <test-dependency>
+ <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
+ <recursive/>
+ <compile-dependency/>
+ </test-dependency>
+ <test-dependency>
+ <code-name-base>org.netbeans.modules.debugger.jpda</code-name-base>
+ <compile-dependency/>
+ <test/>
+ </test-dependency>
+ </test-type>
</test-dependencies>
<friend-packages>
<friend>org.netbeans.modules.debugger.jpda.truffle</friend>
diff --git a/java/debugger.jpda.ui/test/unit/src/org/netbeans/modules/debugger/jpda/ui/debugging/JavaDebuggingViewTest.java b/java/debugger.jpda.ui/test/unit/src/org/netbeans/modules/debugger/jpda/ui/debugging/JavaDebuggingViewTest.java
new file mode 100644
index 000000000000..cbe6d79b8242
--- /dev/null
+++ b/java/debugger.jpda.ui/test/unit/src/org/netbeans/modules/debugger/jpda/ui/debugging/JavaDebuggingViewTest.java
@@ -0,0 +1,100 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.debugger.jpda.ui.debugging;
+
+import java.io.File;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import org.netbeans.api.debugger.DebuggerManager;
+import org.netbeans.api.debugger.jpda.*;
+import org.netbeans.junit.NbTestCase;
+import org.netbeans.spi.debugger.ui.DebuggingView.DVSupport;
+import org.netbeans.spi.debugger.ui.DebuggingView.DVThread;
+import org.openide.filesystems.FileObject;
+import org.openide.filesystems.FileUtil;
+
+public class JavaDebuggingViewTest extends NbTestCase {
+
+ private JPDASupport support;
+
+ public JavaDebuggingViewTest(String s) {
+ super (s);
+ }
+
+ public static junit.framework.Test suite() {
+ return JPDASupport.createTestSuite(JavaDebuggingViewTest.class);
+ }
+
+ protected void setUp () throws Exception {
+ super.setUp ();
+ JPDASupport.removeAllBreakpoints ();
+ }
+
+ public void testEvaluate() throws Exception {
+ String code = "public class Test {\n" +
+ " public static void main(String... args) throws Exception {\n" +
+ " System.out.println(); //LBREAKPOINT\n" +
+ " Thread t = new Thread(() -> {\n" +
+ " System.out.println(); //LBREAKPOINT\n" +
+ " }, \"test\");\n" +
+ " t.start();\n" +
+ " t.join();\n" +
+ " }\n" +
+ "}\n";
+ clearWorkDir();
+ FileObject wd = FileUtil.toFileObject(getWorkDir());
+ assertNotNull(wd);
+ FileObject source = wd.createData("Test.java");
+ try (OutputStream out = source.getOutputStream();
+ Writer w = new OutputStreamWriter(out)) {
+ w.write(code);
+ }
+ Utils.BreakPositions bp = Utils.getBreakPositions(source.toURL());
+ for (LineBreakpoint lb : bp.getLineBreakpoints()) {
+ DebuggerManager.getDebuggerManager ().addBreakpoint (lb);
+ }
+ support = JPDASupport.attach (
+ new String[0],
+ FileUtil.toFile(source).getAbsolutePath(),
+ new String[0],
+ new File[0]
+ );
+ support.waitState (JPDADebugger.STATE_STOPPED);
+ CountDownLatch threadFound = new CountDownLatch(1);
+ DVSupport dvSupport = support.getDebugger().getSession().lookupFirst(null, DVSupport.class);
+ dvSupport.addPropertyChangeListener(evt -> {
+ if (DVSupport.PROP_THREAD_SUSPENDED.equals(evt.getPropertyName())) {
+ DVThread thread = (DVThread) evt.getNewValue();
+ assertEquals("test", thread.getName());
+ threadFound.countDown();
+ }
+ });
+
+ support.doContinue();
+ support.waitState (JPDADebugger.STATE_STOPPED);
+ //ensure the threads have been updated:
+ assertTrue(threadFound.await(10, TimeUnit.SECONDS));
+ support.doContinue();
+ support.doFinish();
+ }
+
+}
diff --git a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/JPDAThreadImpl.java b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/JPDAThreadImpl.java
index 53e14f9410f9..515b88564550 100644
--- a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/JPDAThreadImpl.java
+++ b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/JPDAThreadImpl.java
@@ -1221,6 +1221,7 @@ private PropertyChangeEvent notifySuspended(boolean doFire, boolean explicitelyP
}
Boolean suspendedToFire = null;
accessLock.writeLock().lock();
+ boolean wasInitiallySuspended = initiallySuspended;
initiallySuspended = false;
try {
if (loggerS.isLoggable(Level.FINE)) {
@@ -1252,7 +1253,7 @@ private PropertyChangeEvent notifySuspended(boolean doFire, boolean explicitelyP
//System.err.println("notifySuspended("+getName()+") suspendCount = "+suspendCount+", var suspended = "+suspended);
suspendedNoFire = false;
debugger.setCurrentSuspendedNoFireThread(null);
- if ((!suspended || suspendedNoFire && doFire) && (!verifyStatusAndName || isThreadSuspended())) {
+ if ((!suspended || wasInitiallySuspended || suspendedNoFire && doFire) && (!verifyStatusAndName || isThreadSuspended())) {
//System.err.println(" setting suspended = true");
suspended = true;
suspendedToFire = Boolean.TRUE;