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

     1.1 --- a/src/share/classes/org/omg/CORBA/ORB.java	Thu Oct 17 14:17:54 2013 -0700
     1.2 +++ b/src/share/classes/org/omg/CORBA/ORB.java	Tue Oct 22 11:40:27 2013 +0100
     1.3 @@ -174,15 +174,6 @@
     1.4      private static final String ORBSingletonClassKey = "org.omg.CORBA.ORBSingletonClass";
     1.5  
     1.6      //
     1.7 -    // The last resort fallback ORB implementation classes in case
     1.8 -    // no ORB implementation class is dynamically configured through
     1.9 -    // properties or applet parameters. Change these values to
    1.10 -    // vendor-specific class names.
    1.11 -    //
    1.12 -    private static final String defaultORB = "com.sun.corba.se.impl.orb.ORBImpl";
    1.13 -    private static final String defaultORBSingleton = "com.sun.corba.se.impl.orb.ORBSingleton";
    1.14 -
    1.15 -    //
    1.16      // The global instance of the singleton ORB implementation which
    1.17      // acts as a factory for typecodes for generated Helper classes.
    1.18      // TypeCodes should be immutable since they may be shared across
    1.19 @@ -294,10 +285,11 @@
    1.20              String className = getSystemProperty(ORBSingletonClassKey);
    1.21              if (className == null)
    1.22                  className = getPropertyFromFile(ORBSingletonClassKey);
    1.23 -            if (className == null)
    1.24 -                className = defaultORBSingleton;
    1.25 -
    1.26 -            singleton = create_impl(className);
    1.27 +            if (className == null) {
    1.28 +                singleton = new com.sun.corba.se.impl.orb.ORBSingleton();
    1.29 +            } else {
    1.30 +                singleton = create_impl(className);
    1.31 +            }
    1.32          }
    1.33          return singleton;
    1.34      }
    1.35 @@ -347,10 +339,12 @@
    1.36              className = getSystemProperty(ORBClassKey);
    1.37          if (className == null)
    1.38              className = getPropertyFromFile(ORBClassKey);
    1.39 -        if (className == null)
    1.40 -            className = defaultORB;
    1.41 +        if (className == null) {
    1.42 +            orb = new com.sun.corba.se.impl.orb.ORBImpl();
    1.43 +        } else {
    1.44 +            orb = create_impl(className);
    1.45 +        }
    1.46  
    1.47 -        orb = create_impl(className);
    1.48          orb.set_parameters(args, props);
    1.49          return orb;
    1.50      }
    1.51 @@ -375,10 +369,12 @@
    1.52              className = getSystemProperty(ORBClassKey);
    1.53          if (className == null)
    1.54              className = getPropertyFromFile(ORBClassKey);
    1.55 -        if (className == null)
    1.56 -            className = defaultORB;
    1.57 +        if (className == null) {
    1.58 +            orb = new com.sun.corba.se.impl.orb.ORBImpl();
    1.59 +        } else {
    1.60 +            orb = create_impl(className);
    1.61 +        }
    1.62  
    1.63 -        orb = create_impl(className);
    1.64          orb.set_parameters(app, props);
    1.65          return orb;
    1.66      }