Mercurial > jdk8-mips64-public > corba / changeset
changeset
Merge
Thu, 31 Oct 2013 16:30:42 -0700
- author
- lana
- date
- Thu, 31 Oct 2013 16:30:42 -0700
- changeset 536
- 8d07115924b7
- parent 532
- d425685e0b74
- parent 535
- 219e616a6a4f
- child 537
- 5fdc44652089
Merge
1.1 --- a/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Thu Oct 31 12:36:05 2013 -0700 1.2 +++ b/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Thu Oct 31 16:30:42 2013 -0700 1.3 @@ -580,7 +580,7 @@ 1.4 java.lang.Object[] objholder = new java.lang.Object[1]; 1.5 objholder[0] = object; 1.6 long[] longholder = new long[1]; 1.7 - TCUtility.unmarshalIn(in, typeCode, longholder, objholder); 1.8 + TCUtility.unmarshalIn(in, realType(), longholder, objholder); 1.9 value = longholder[0]; 1.10 object = objholder[0]; 1.11 stream = null;
2.1 --- a/src/share/classes/javax/rmi/CORBA/Stub.java Thu Oct 31 12:36:05 2013 -0700 2.2 +++ b/src/share/classes/javax/rmi/CORBA/Stub.java Thu Oct 31 16:30:42 2013 -0700 2.3 @@ -61,13 +61,11 @@ 2.4 private transient StubDelegate stubDelegate = null; 2.5 private static Class stubDelegateClass = null; 2.6 private static final String StubClassKey = "javax.rmi.CORBA.StubClass"; 2.7 - private static final String defaultStubImplName = "com.sun.corba.se.impl.javax.rmi.CORBA.StubDelegateImpl"; 2.8 2.9 static { 2.10 - Object stubDelegateInstance = (Object) createDelegateIfSpecified(StubClassKey, defaultStubImplName); 2.11 + Object stubDelegateInstance = createDelegate(StubClassKey); 2.12 if (stubDelegateInstance != null) 2.13 stubDelegateClass = stubDelegateInstance.getClass(); 2.14 - 2.15 } 2.16 2.17 2.18 @@ -207,7 +205,7 @@ 2.19 // are in different packages and the visibility needs to be package for 2.20 // security reasons. If you know a better solution how to share this code 2.21 // then remove it from PortableRemoteObject. Also in Util.java 2.22 - private static Object createDelegateIfSpecified(String classKey, String defaultClassName) { 2.23 + private static Object createDelegate(String classKey) { 2.24 String className = (String) 2.25 AccessController.doPrivileged(new GetPropertyAction(classKey)); 2.26 if (className == null) { 2.27 @@ -218,7 +216,7 @@ 2.28 } 2.29 2.30 if (className == null) { 2.31 - className = defaultClassName; 2.32 + return new com.sun.corba.se.impl.javax.rmi.CORBA.StubDelegateImpl(); 2.33 } 2.34 2.35 try {
3.1 --- a/src/share/classes/javax/rmi/CORBA/Util.java Thu Oct 31 12:36:05 2013 -0700 3.2 +++ b/src/share/classes/javax/rmi/CORBA/Util.java Thu Oct 31 16:30:42 2013 -0700 3.3 @@ -60,14 +60,11 @@ 3.4 public class Util { 3.5 3.6 // This can only be set at static initialization time (no sync necessary). 3.7 - private static javax.rmi.CORBA.UtilDelegate utilDelegate = null; 3.8 + private static final javax.rmi.CORBA.UtilDelegate utilDelegate; 3.9 private static final String UtilClassKey = "javax.rmi.CORBA.UtilClass"; 3.10 - private static final String defaultUtilImplName = 3.11 -"com.sun.corba.se.impl.javax.rmi.CORBA.Util"; 3.12 3.13 static { 3.14 - utilDelegate = (javax.rmi.CORBA.UtilDelegate) 3.15 - createDelegateIfSpecified(UtilClassKey, defaultUtilImplName); 3.16 + utilDelegate = (javax.rmi.CORBA.UtilDelegate)createDelegate(UtilClassKey); 3.17 } 3.18 3.19 private Util(){} 3.20 @@ -338,9 +335,7 @@ 3.21 // are in different packages and the visibility needs to be package for 3.22 // security reasons. If you know a better solution how to share this code 3.23 // then remove it from PortableRemoteObject. Also in Stub.java 3.24 - private static Object createDelegateIfSpecified(String classKey, 3.25 - String defaultClassName) 3.26 - { 3.27 + private static Object createDelegate(String classKey) { 3.28 String className = (String) 3.29 AccessController.doPrivileged(new GetPropertyAction(classKey)); 3.30 if (className == null) { 3.31 @@ -351,7 +346,7 @@ 3.32 } 3.33 3.34 if (className == null) { 3.35 - className = defaultClassName; 3.36 + return new com.sun.corba.se.impl.javax.rmi.CORBA.Util(); 3.37 } 3.38 3.39 try {
4.1 --- a/src/share/classes/javax/rmi/PortableRemoteObject.java Thu Oct 31 12:36:05 2013 -0700 4.2 +++ b/src/share/classes/javax/rmi/PortableRemoteObject.java Thu Oct 31 16:30:42 2013 -0700 4.3 @@ -65,17 +65,14 @@ 4.4 */ 4.5 public class PortableRemoteObject { 4.6 4.7 - private static javax.rmi.CORBA.PortableRemoteObjectDelegate proDelegate = null; 4.8 + private static final javax.rmi.CORBA.PortableRemoteObjectDelegate proDelegate; 4.9 4.10 private static final String PortableRemoteObjectClassKey = 4.11 "javax.rmi.CORBA.PortableRemoteObjectClass"; 4.12 4.13 - private static final String defaultPortableRemoteObjectImplName = 4.14 - "com.sun.corba.se.impl.javax.rmi.PortableRemoteObject"; 4.15 - 4.16 static { 4.17 proDelegate = (javax.rmi.CORBA.PortableRemoteObjectDelegate) 4.18 - createDelegateIfSpecified(PortableRemoteObjectClassKey); 4.19 + createDelegate(PortableRemoteObjectClassKey); 4.20 } 4.21 4.22 /** 4.23 @@ -181,7 +178,7 @@ 4.24 // are in different packages and the visibility needs to be package for 4.25 // security reasons. If you know a better solution how to share this code 4.26 // then remove it from here. 4.27 - private static Object createDelegateIfSpecified(String classKey) { 4.28 + private static Object createDelegate(String classKey) { 4.29 String className = (String) 4.30 AccessController.doPrivileged(new GetPropertyAction(classKey)); 4.31 if (className == null) { 4.32 @@ -191,7 +188,7 @@ 4.33 } 4.34 } 4.35 if (className == null) { 4.36 - className = defaultPortableRemoteObjectImplName; 4.37 + return new com.sun.corba.se.impl.javax.rmi.PortableRemoteObject(); 4.38 } 4.39 4.40 try {
5.1 --- a/src/share/classes/org/omg/CORBA/ORB.java Thu Oct 31 12:36:05 2013 -0700 5.2 +++ b/src/share/classes/org/omg/CORBA/ORB.java Thu Oct 31 16:30:42 2013 -0700 5.3 @@ -174,15 +174,6 @@ 5.4 private static final String ORBSingletonClassKey = "org.omg.CORBA.ORBSingletonClass"; 5.5 5.6 // 5.7 - // The last resort fallback ORB implementation classes in case 5.8 - // no ORB implementation class is dynamically configured through 5.9 - // properties or applet parameters. Change these values to 5.10 - // vendor-specific class names. 5.11 - // 5.12 - private static final String defaultORB = "com.sun.corba.se.impl.orb.ORBImpl"; 5.13 - private static final String defaultORBSingleton = "com.sun.corba.se.impl.orb.ORBSingleton"; 5.14 - 5.15 - // 5.16 // The global instance of the singleton ORB implementation which 5.17 // acts as a factory for typecodes for generated Helper classes. 5.18 // TypeCodes should be immutable since they may be shared across 5.19 @@ -294,10 +285,11 @@ 5.20 String className = getSystemProperty(ORBSingletonClassKey); 5.21 if (className == null) 5.22 className = getPropertyFromFile(ORBSingletonClassKey); 5.23 - if (className == null) 5.24 - className = defaultORBSingleton; 5.25 - 5.26 - singleton = create_impl(className); 5.27 + if (className == null) { 5.28 + singleton = new com.sun.corba.se.impl.orb.ORBSingleton(); 5.29 + } else { 5.30 + singleton = create_impl(className); 5.31 + } 5.32 } 5.33 return singleton; 5.34 } 5.35 @@ -347,10 +339,12 @@ 5.36 className = getSystemProperty(ORBClassKey); 5.37 if (className == null) 5.38 className = getPropertyFromFile(ORBClassKey); 5.39 - if (className == null) 5.40 - className = defaultORB; 5.41 + if (className == null) { 5.42 + orb = new com.sun.corba.se.impl.orb.ORBImpl(); 5.43 + } else { 5.44 + orb = create_impl(className); 5.45 + } 5.46 5.47 - orb = create_impl(className); 5.48 orb.set_parameters(args, props); 5.49 return orb; 5.50 } 5.51 @@ -375,10 +369,12 @@ 5.52 className = getSystemProperty(ORBClassKey); 5.53 if (className == null) 5.54 className = getPropertyFromFile(ORBClassKey); 5.55 - if (className == null) 5.56 - className = defaultORB; 5.57 + if (className == null) { 5.58 + orb = new com.sun.corba.se.impl.orb.ORBImpl(); 5.59 + } else { 5.60 + orb = create_impl(className); 5.61 + } 5.62 5.63 - orb = create_impl(className); 5.64 orb.set_parameters(app, props); 5.65 return orb; 5.66 }
