Merge branch 'dev' of https://github.com/javapathfinder/jpf-core into dev

diff --git a/src/classes/sun/misc/SharedSecrets.java b/src/classes/sun/misc/SharedSecrets.java
index 8c7fd6f142d4a4a6b58c2167ce7074e6bc94e246..c74ff4aae9bf023d2877e8216017346a3851d234 100644 (file)
--- a/src/classes/sun/misc/SharedSecrets.java
+++ b/src/classes/sun/misc/SharedSecrets.java
@@ -58,8 +58,7 @@ public class SharedSecrets {
   private static JavaNioAccess javaNioAccess;
   private static JavaAWTAccess javaAWTAccess;
   private static JavaOISAccess javaOISAccess;
-  // removed in Java8u161
-  // private static JavaObjectInputStreamAccess javaObjectInputStreamAccess;
+  private static JavaObjectInputStreamAccess javaObjectInputStreamAccess;
 
   // (required for EnumSet ops)
   public static JavaLangAccess getJavaLangAccess() {
@@ -139,7 +138,7 @@ public class SharedSecrets {
 
     return javaIOFileDescriptorAccess;
   }
-/*
+
   public static JavaObjectInputStreamAccess getJavaObjectInputStreamAccess() {
     if (javaObjectInputStreamAccess == null) {
       unsafe.ensureClassInitialized(ObjectInputStream.class);
@@ -152,7 +151,7 @@ public class SharedSecrets {
   public static void setJavaObjectInputStreamAccess(JavaObjectInputStreamAccess access) {
     javaObjectInputStreamAccess = access;
   }
-*/  
+  
   public static void setJavaAWTAccess (JavaAWTAccess jaa){
     javaAWTAccess = jaa;
   }