src/java.base/share/classes/java/io/ObjectStreamClass.java

rev 15357 : imported patch 8163517-Various-cleanup-in-java-io-code

*** 1507,1521 ****
       * Returns package name of given class.
       */
      private static String getPackageName(Class<?> cl) {
          String s = cl.getName();
          int i = s.lastIndexOf('[');
!         if (i >= 0) {
!             s = s.substring(i + 2);
!         }
!         i = s.lastIndexOf('.');
!         return (i >= 0) ? s.substring(0, i) : "";
      }
  
      /**
       * Compares class names for equality, ignoring package names.  Returns true
       * if class names equal, false otherwise.
--- 1507,1519 ----
       * Returns package name of given class.
       */
      private static String getPackageName(Class<?> cl) {
          String s = cl.getName();
          int i = s.lastIndexOf('[');
!         i = (i < 0) ? 0 : i + 2;
!         int j = s.lastIndexOf('.');
!         return (i < j) ? s.substring(i, j) : "";
      }
  
      /**
       * Compares class names for equality, ignoring package names.  Returns true
       * if class names equal, false otherwise.
*** 1533,1550 ****
       * Returns JVM type signature for given list of parameters and return type.
       */
      private static String getMethodSignature(Class<?>[] paramTypes,
                                               Class<?> retType)
      {
!         StringBuilder sbuf = new StringBuilder();
!         sbuf.append('(');
          for (int i = 0; i < paramTypes.length; i++) {
!             appendClassSignature(sbuf, paramTypes[i]);
          }
!         sbuf.append(')');
!         appendClassSignature(sbuf, retType);
!         return sbuf.toString();
      }
  
      /**
       * Convenience method for throwing an exception that is either a
       * RuntimeException, Error, or of some unexpected type (in which case it is
--- 1531,1548 ----
       * Returns JVM type signature for given list of parameters and return type.
       */
      private static String getMethodSignature(Class<?>[] paramTypes,
                                               Class<?> retType)
      {
!         StringBuilder sb = new StringBuilder();
!         sb.append('(');
          for (int i = 0; i < paramTypes.length; i++) {
!             appendClassSignature(sb, paramTypes[i]);
          }
!         sb.append(')');
!         appendClassSignature(sb, retType);
!         return sb.toString();
      }
  
      /**
       * Convenience method for throwing an exception that is either a
       * RuntimeException, Error, or of some unexpected type (in which case it is