Mercurial > jdk8-mips64-public > corba / file comparison
comparison: src/share/classes/org/omg/CORBA/ORB.java
src/share/classes/org/omg/CORBA/ORB.java
- changeset 545
- fe781b3badd6
- parent 533
- 52ad44f9a3ec
- child 615
- 8b0b643ffd42
equal
deleted
inserted
replaced
| 544:9729f9862eb4 | 545:fe781b3badd6 |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. |
| 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
| 4 * | 4 * |
| 5 * This code is free software; you can redistribute it and/or modify it | 5 * This code is free software; you can redistribute it and/or modify it |
| 6 * under the terms of the GNU General Public License version 2 only, as | 6 * under the terms of the GNU General Public License version 2 only, as |
| 7 * published by the Free Software Foundation. Oracle designates this | 7 * published by the Free Software Foundation. Oracle designates this |
| 283 public static synchronized ORB init() { | 283 public static synchronized ORB init() { |
| 284 if (singleton == null) { | 284 if (singleton == null) { |
| 285 String className = getSystemProperty(ORBSingletonClassKey); | 285 String className = getSystemProperty(ORBSingletonClassKey); |
| 286 if (className == null) | 286 if (className == null) |
| 287 className = getPropertyFromFile(ORBSingletonClassKey); | 287 className = getPropertyFromFile(ORBSingletonClassKey); |
| 288 if (className == null) { | 288 if ((className == null) || |
| 289 (className.equals("com.sun.corba.se.impl.orb.ORBSingleton"))) { | |
| 289 singleton = new com.sun.corba.se.impl.orb.ORBSingleton(); | 290 singleton = new com.sun.corba.se.impl.orb.ORBSingleton(); |
| 290 } else { | 291 } else { |
| 291 singleton = create_impl(className); | 292 singleton = create_impl(className); |
| 292 } | 293 } |
| 293 } | 294 } |
| 337 className = props.getProperty(ORBClassKey); | 338 className = props.getProperty(ORBClassKey); |
| 338 if (className == null) | 339 if (className == null) |
| 339 className = getSystemProperty(ORBClassKey); | 340 className = getSystemProperty(ORBClassKey); |
| 340 if (className == null) | 341 if (className == null) |
| 341 className = getPropertyFromFile(ORBClassKey); | 342 className = getPropertyFromFile(ORBClassKey); |
| 342 if (className == null) { | 343 if ((className == null) || |
| 344 (className.equals("com.sun.corba.se.impl.orb.ORBImpl"))) { | |
| 343 orb = new com.sun.corba.se.impl.orb.ORBImpl(); | 345 orb = new com.sun.corba.se.impl.orb.ORBImpl(); |
| 344 } else { | 346 } else { |
| 345 orb = create_impl(className); | 347 orb = create_impl(className); |
| 346 } | 348 } |
| 347 | 349 |
| 367 className = props.getProperty(ORBClassKey); | 369 className = props.getProperty(ORBClassKey); |
| 368 if (className == null) | 370 if (className == null) |
| 369 className = getSystemProperty(ORBClassKey); | 371 className = getSystemProperty(ORBClassKey); |
| 370 if (className == null) | 372 if (className == null) |
| 371 className = getPropertyFromFile(ORBClassKey); | 373 className = getPropertyFromFile(ORBClassKey); |
| 372 if (className == null) { | 374 if ((className == null) || |
| 375 (className.equals("com.sun.corba.se.impl.orb.ORBImpl"))) { | |
| 373 orb = new com.sun.corba.se.impl.orb.ORBImpl(); | 376 orb = new com.sun.corba.se.impl.orb.ORBImpl(); |
| 374 } else { | 377 } else { |
| 375 orb = create_impl(className); | 378 orb = create_impl(className); |
| 376 } | 379 } |
| 377 | 380 |
