corba/src/share/classes/org/omg/CORBA/ORB.java

*** 1,7 ****
  /*
!  * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 283,293 ****
      public static synchronized ORB init() {
          if (singleton == null) {
              String className = getSystemProperty(ORBSingletonClassKey);
              if (className == null)
                  className = getPropertyFromFile(ORBSingletonClassKey);
!             if (className == null) {
                  singleton = new com.sun.corba.se.impl.orb.ORBSingleton();
              } else {
                  singleton = create_impl(className);
              }
          }
--- 283,294 ----
      public static synchronized ORB init() {
          if (singleton == null) {
              String className = getSystemProperty(ORBSingletonClassKey);
              if (className == null)
                  className = getPropertyFromFile(ORBSingletonClassKey);
!             if ((className == null) || 
!                     (className.equals("com.sun.corba.se.impl.orb.ORBSingleton"))) {
                  singleton = new com.sun.corba.se.impl.orb.ORBSingleton();
              } else {
                  singleton = create_impl(className);
              }
          }
*** 337,347 ****
              className = props.getProperty(ORBClassKey);
          if (className == null)
              className = getSystemProperty(ORBClassKey);
          if (className == null)
              className = getPropertyFromFile(ORBClassKey);
!         if (className == null) {
              orb = new com.sun.corba.se.impl.orb.ORBImpl();
          } else {
              orb = create_impl(className);
          }
  
--- 338,349 ----
              className = props.getProperty(ORBClassKey);
          if (className == null)
              className = getSystemProperty(ORBClassKey);
          if (className == null)
              className = getPropertyFromFile(ORBClassKey);
!         if ((className == null) || 
!                     (className.equals("com.sun.corba.se.impl.orb.ORBImpl"))) {
              orb = new com.sun.corba.se.impl.orb.ORBImpl();
          } else {
              orb = create_impl(className);
          }
  
*** 367,377 ****
              className = props.getProperty(ORBClassKey);
          if (className == null)
              className = getSystemProperty(ORBClassKey);
          if (className == null)
              className = getPropertyFromFile(ORBClassKey);
!         if (className == null) {
              orb = new com.sun.corba.se.impl.orb.ORBImpl();
          } else {
              orb = create_impl(className);
          }
  
--- 369,380 ----
              className = props.getProperty(ORBClassKey);
          if (className == null)
              className = getSystemProperty(ORBClassKey);
          if (className == null)
              className = getPropertyFromFile(ORBClassKey);
!         if ((className == null) || 
!                     (className.equals("com.sun.corba.se.impl.orb.ORBImpl"))) {
              orb = new com.sun.corba.se.impl.orb.ORBImpl();
          } else {
              orb = create_impl(className);
          }