From 295105a8ec3e82ff1bfd2a902968d90d52da741a Mon Sep 17 00:00:00 2001
From: Chris Plummer <chris.plummer@oracle.com>
Date: Mon, 8 Jun 2026 07:40:30 -0700
Subject: [PATCH] cleanup some comments

---
 src/jdk.jdi/share/classes/com/sun/jdi/ClassType.java        | 2 +-
 src/jdk.jdi/share/classes/com/sun/jdi/ObjectReference.java  | 2 +-
 .../share/classes/com/sun/tools/jdi/ClassTypeImpl.java      | 6 +-----
 .../share/classes/com/sun/tools/jdi/InvokableTypeImpl.java  | 6 +-----
 .../classes/com/sun/tools/jdi/ObjectReferenceImpl.java      | 6 +-----
 5 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/ClassType.java b/src/jdk.jdi/share/classes/com/sun/jdi/ClassType.java
index 0c91af6d987..b1fb05c913a 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/ClassType.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/ClassType.java
@@ -125,7 +125,7 @@ public interface ClassType extends ReferenceType {
 
     /** Perform method invocation with only the invoking thread resumed */
     static final int INVOKE_SINGLE_THREADED = 0x1;
-    /** Perform perform the equivalent of ObjectReference.disableCollection() on
+    /** Perform the equivalent of ObjectReference.disableCollection() on
         any ObjectReference returned, including any exception thrown. */
     static final int INVOKE_DISABLE_COLLECTION = 0x4;
 
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/ObjectReference.java b/src/jdk.jdi/share/classes/com/sun/jdi/ObjectReference.java
index 43bbedd2e3d..a7a08e7a55e 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/ObjectReference.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/ObjectReference.java
@@ -143,7 +143,7 @@ public interface ObjectReference extends Value {
     static final int INVOKE_SINGLE_THREADED = 0x1;
     /** Perform non-virtual method invocation */
     static final int INVOKE_NONVIRTUAL      = 0x2;
-    /** Perform perform the equivalent of ObjectReference.disableCollection() on
+    /** Perform the equivalent of ObjectReference.disableCollection() on
         any ObjectReference returned, including any exception thrown. */
     static final int INVOKE_DISABLE_COLLECTION = 0x4;
 
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/ClassTypeImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ClassTypeImpl.java
index 650fa2fab48..382d70cdcbe 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/ClassTypeImpl.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ClassTypeImpl.java
@@ -235,12 +235,8 @@ public final class ClassTypeImpl extends InvokableTypeImpl
             vm.notifySuspend();
         }
 
-        /*
-         * If there is a returned Object or an exception Object, make sure GC
-         * is disabled if requested.
-         */
         if ((options & INVOKE_DISABLE_COLLECTION) != 0) {
-            // Account for implicit disableCollection() done by the debug agent.
+            // Account for implicit disableCollection() done by JDWP.
             if (ret.exception != null) {
                 ret.exception.incrementGcDisableCount();
             } else {
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/InvokableTypeImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/InvokableTypeImpl.java
index d503bfc4c04..be90404acb8 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/InvokableTypeImpl.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/InvokableTypeImpl.java
@@ -126,12 +126,8 @@ abstract class InvokableTypeImpl extends ReferenceTypeImpl {
             vm.notifySuspend();
         }
 
-        /*
-         * If there is a returned Object or an exception Object, make sure GC
-         * is disabled if requested.
-         */
         if ((options & ClassType.INVOKE_DISABLE_COLLECTION) != 0) {
-            // Account for implicit disableCollection() done by the debug agent.
+            // Account for implicit disableCollection() done by JDWP.
             if (ret.getException() != null) {
                 ret.getException().incrementGcDisableCount();
             } else {
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/ObjectReferenceImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ObjectReferenceImpl.java
index 9bed41b945d..26ef769dc77 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/ObjectReferenceImpl.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/ObjectReferenceImpl.java
@@ -424,12 +424,8 @@ public class ObjectReferenceImpl extends ValueImpl
             vm.notifySuspend();
         }
 
-        /*
-         * If there is a returned Object or an exception Object, make sure GC
-         * is disabled if requested.
-         */
         if ((options & INVOKE_DISABLE_COLLECTION) != 0) {
-            // Account for implicit disableCollection() done by the debug agent.
+            // Account for implicit disableCollection() done by JDWP.
             if (ret.exception != null) {
                 ret.exception.incrementGcDisableCount();
             } else {