--- old/src/jdk.jdi/share/classes/com/sun/tools/jdi/JNITypeParser.java	2020-04-15 11:02:31.000000000 -0700
+++ new/src/jdk.jdi/share/classes/com/sun/tools/jdi/JNITypeParser.java	2020-04-15 11:02:30.000000000 -0700
@@ -80,7 +80,7 @@
             } else {
                 sb.append(typeName.substring(0, index).replace('.', '/'));
                 sb.append(".");
-                sb.append(typeName.substring(index+1, typeName.length()));
+                sb.append(typeName.substring(index + 1));
             }
             sb.append(';');
         }
@@ -214,8 +214,9 @@
                 if (index < 0) {
                     retVal = retVal.replace('/', '.');
                 } else {
-                    retVal = retVal.substring(0, index).replace('/', '.') + "/" +
-                             retVal.substring(index + 1, retVal.length());
+                    // hidden class
+                    retVal = retVal.substring(0, index).replace('/', '.')
+                                + "/" + retVal.substring(index + 1);
                 }
                 currentIndex = endClass + 1;
                 return retVal;