infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-28 07:41:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

8028215: ORB.init fails with SecurityException if properties select the JDK default ORB

Browse Source 
Check for default ORBImpl and ORBSingleton set via properties or System properties

Reviewed-by: alanb, coffeys, mchung
This commit is contained in:
Mark Sheppard 2013-11-21 11:30:39 +00:00
parent fa987f0973
commit 4f81d649fb
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
corba/src/share/classes/org/omg/CORBA/ORB.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
* 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
@ -285,7 +285,8 @@ abstract public class ORB {
String className = getSystemProperty(ORBSingletonClassKey);
if (className == null)
className = getPropertyFromFile(ORBSingletonClassKey);
if (className == null) {
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);
@ -339,7 +340,8 @@ abstract public class ORB {
className = getSystemProperty(ORBClassKey);
if (className == null)
className = getPropertyFromFile(ORBClassKey);
if (className == null) {
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);
@ -369,7 +371,8 @@ abstract public class ORB {
className = getSystemProperty(ORBClassKey);
if (className == null)
className = getPropertyFromFile(ORBClassKey);
if (className == null) {
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);