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

*** 365,375 ****
                  entry = new ObjectStreamClass(cl);
              } catch (Throwable th) {
                  entry = th;
              }
              if (future.set(entry)) {
!                 Caches.localDescs.put(key, new SoftReference<Object>(entry));
              } else {
                  // nested lookup call already set future
                  entry = future.get();
              }
          }
--- 365,375 ----
                  entry = new ObjectStreamClass(cl);
              } catch (Throwable th) {
                  entry = th;
              }
              if (future.set(entry)) {
!                 Caches.localDescs.put(key, new SoftReference<>(entry));
              } else {
                  // nested lookup call already set future
                  entry = future.get();
              }
          }
*** 428,438 ****
                      interrupted = true;
                  }
              }
              if (interrupted) {
                  AccessController.doPrivileged(
!                     new PrivilegedAction<Void>() {
                          public Void run() {
                              Thread.currentThread().interrupt();
                              return null;
                          }
                      }
--- 428,438 ----
                      interrupted = true;
                  }
              }
              if (interrupted) {
                  AccessController.doPrivileged(
!                     new PrivilegedAction<>() {
                          public Void run() {
                              Thread.currentThread().interrupt();
                              return null;
                          }
                      }
*** 463,473 ****
          Class<?> superCl = cl.getSuperclass();
          superDesc = (superCl != null) ? lookup(superCl, false) : null;
          localDesc = this;
  
          if (serializable) {
!             AccessController.doPrivileged(new PrivilegedAction<Void>() {
                  public Void run() {
                      if (isEnum) {
                          suid = Long.valueOf(0);
                          fields = NO_FIELDS;
                          return null;
--- 463,473 ----
          Class<?> superCl = cl.getSuperclass();
          superDesc = (superCl != null) ? lookup(superCl, false) : null;
          localDesc = this;
  
          if (serializable) {
!             AccessController.doPrivileged(new PrivilegedAction<>() {
                  public Void run() {
                      if (isEnum) {
                          suid = Long.valueOf(0);
                          fields = NO_FIELDS;
                          return null;
*** 1731,1741 ****
              Field[] fields = cl.getDeclaredFields();
              MemberSignature[] fieldSigs = new MemberSignature[fields.length];
              for (int i = 0; i < fields.length; i++) {
                  fieldSigs[i] = new MemberSignature(fields[i]);
              }
!             Arrays.sort(fieldSigs, new Comparator<MemberSignature>() {
                  public int compare(MemberSignature ms1, MemberSignature ms2) {
                      return ms1.name.compareTo(ms2.name);
                  }
              });
              for (int i = 0; i < fieldSigs.length; i++) {
--- 1731,1741 ----
              Field[] fields = cl.getDeclaredFields();
              MemberSignature[] fieldSigs = new MemberSignature[fields.length];
              for (int i = 0; i < fields.length; i++) {
                  fieldSigs[i] = new MemberSignature(fields[i]);
              }
!             Arrays.sort(fieldSigs, new Comparator<>() {
                  public int compare(MemberSignature ms1, MemberSignature ms2) {
                      return ms1.name.compareTo(ms2.name);
                  }
              });
              for (int i = 0; i < fieldSigs.length; i++) {
*** 1762,1772 ****
              Constructor<?>[] cons = cl.getDeclaredConstructors();
              MemberSignature[] consSigs = new MemberSignature[cons.length];
              for (int i = 0; i < cons.length; i++) {
                  consSigs[i] = new MemberSignature(cons[i]);
              }
!             Arrays.sort(consSigs, new Comparator<MemberSignature>() {
                  public int compare(MemberSignature ms1, MemberSignature ms2) {
                      return ms1.signature.compareTo(ms2.signature);
                  }
              });
              for (int i = 0; i < consSigs.length; i++) {
--- 1762,1772 ----
              Constructor<?>[] cons = cl.getDeclaredConstructors();
              MemberSignature[] consSigs = new MemberSignature[cons.length];
              for (int i = 0; i < cons.length; i++) {
                  consSigs[i] = new MemberSignature(cons[i]);
              }
!             Arrays.sort(consSigs, new Comparator<>() {
                  public int compare(MemberSignature ms1, MemberSignature ms2) {
                      return ms1.signature.compareTo(ms2.signature);
                  }
              });
              for (int i = 0; i < consSigs.length; i++) {
*** 1785,1795 ****
  
              MemberSignature[] methSigs = new MemberSignature[methods.length];
              for (int i = 0; i < methods.length; i++) {
                  methSigs[i] = new MemberSignature(methods[i]);
              }
!             Arrays.sort(methSigs, new Comparator<MemberSignature>() {
                  public int compare(MemberSignature ms1, MemberSignature ms2) {
                      int comp = ms1.name.compareTo(ms2.name);
                      if (comp == 0) {
                          comp = ms1.signature.compareTo(ms2.signature);
                      }
--- 1785,1795 ----
  
              MemberSignature[] methSigs = new MemberSignature[methods.length];
              for (int i = 0; i < methods.length; i++) {
                  methSigs[i] = new MemberSignature(methods[i]);
              }
!             Arrays.sort(methSigs, new Comparator<>() {
                  public int compare(MemberSignature ms1, MemberSignature ms2) {
                      int comp = ms1.name.compareTo(ms2.name);
                      if (comp == 0) {
                          comp = ms1.signature.compareTo(ms2.signature);
                      }
*** 2162,2172 ****
                  entry = new FieldReflector(matchFields(fields, localDesc));
              } catch (Throwable th) {
                  entry = th;
              }
              future.set(entry);
!             Caches.reflectors.put(key, new SoftReference<Object>(entry));
          }
  
          if (entry instanceof FieldReflector) {
              return (FieldReflector) entry;
          } else if (entry instanceof InvalidClassException) {
--- 2162,2172 ----
                  entry = new FieldReflector(matchFields(fields, localDesc));
              } catch (Throwable th) {
                  entry = th;
              }
              future.set(entry);
!             Caches.reflectors.put(key, new SoftReference<>(entry));
          }
  
          if (entry instanceof FieldReflector) {
              return (FieldReflector) entry;
          } else if (entry instanceof InvalidClassException) {