Mercurial > jdk8-mips64-public > corba / file diff

     1.1 --- a/src/share/classes/sun/corba/SharedSecrets.java	Tue Feb 13 12:14:04 2018 -0800
     1.2 +++ b/src/share/classes/sun/corba/SharedSecrets.java	Wed Feb 07 00:10:57 2018 -0800
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -26,8 +26,10 @@
    1.11  package sun.corba;
    1.12  
    1.13  import com.sun.corba.se.impl.io.ValueUtility;
    1.14 +import sun.misc.JavaOISAccess;
    1.15  import sun.misc.Unsafe;
    1.16  
    1.17 +import java.io.ObjectInputStream;
    1.18  import java.security.AccessController;
    1.19  
    1.20  /** A repository of "shared secrets", which are a mechanism for
    1.21 @@ -43,6 +45,7 @@
    1.22  public class SharedSecrets {
    1.23      private static final Unsafe unsafe = Unsafe.getUnsafe();
    1.24      private static JavaCorbaAccess javaCorbaAccess;
    1.25 +    private static JavaOISAccess javaOISAccess;
    1.26  
    1.27      public static JavaCorbaAccess getJavaCorbaAccess() {
    1.28          if (javaCorbaAccess == null) {
    1.29 @@ -57,4 +60,15 @@
    1.30          javaCorbaAccess = access;
    1.31      }
    1.32  
    1.33 +    public static void setJavaOISAccess(JavaOISAccess access) {
    1.34 +        javaOISAccess = access;
    1.35 +    }
    1.36 +
    1.37 +    public static JavaOISAccess getJavaOISAccess() {
    1.38 +        if (javaOISAccess == null)
    1.39 +            unsafe.ensureClassInitialized(ObjectInputStream.class);
    1.40 +
    1.41 +        return javaOISAccess;
    1.42 +    }
    1.43 +
    1.44  }