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

     1.1 --- a/src/share/classes/org/omg/CORBA/ORB.java	Mon Nov 04 11:09:07 2013 +0100
     1.2 +++ b/src/share/classes/org/omg/CORBA/ORB.java	Thu Nov 21 11:30:39 2013 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1995, 2013, 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 @@ -285,7 +285,8 @@
    1.11              String className = getSystemProperty(ORBSingletonClassKey);
    1.12              if (className == null)
    1.13                  className = getPropertyFromFile(ORBSingletonClassKey);
    1.14 -            if (className == null) {
    1.15 +            if ((className == null) ||
    1.16 +                    (className.equals("com.sun.corba.se.impl.orb.ORBSingleton"))) {
    1.17                  singleton = new com.sun.corba.se.impl.orb.ORBSingleton();
    1.18              } else {
    1.19                  singleton = create_impl(className);
    1.20 @@ -339,7 +340,8 @@
    1.21              className = getSystemProperty(ORBClassKey);
    1.22          if (className == null)
    1.23              className = getPropertyFromFile(ORBClassKey);
    1.24 -        if (className == null) {
    1.25 +        if ((className == null) ||
    1.26 +                    (className.equals("com.sun.corba.se.impl.orb.ORBImpl"))) {
    1.27              orb = new com.sun.corba.se.impl.orb.ORBImpl();
    1.28          } else {
    1.29              orb = create_impl(className);
    1.30 @@ -369,7 +371,8 @@
    1.31              className = getSystemProperty(ORBClassKey);
    1.32          if (className == null)
    1.33              className = getPropertyFromFile(ORBClassKey);
    1.34 -        if (className == null) {
    1.35 +        if ((className == null) ||
    1.36 +                    (className.equals("com.sun.corba.se.impl.orb.ORBImpl"))) {
    1.37              orb = new com.sun.corba.se.impl.orb.ORBImpl();
    1.38          } else {
    1.39              orb = create_impl(className);