# HG changeset patch
# User lana
# Date 1487870037 0
# Node ID 5fccf867b933454cdc3cfffc6501d567fb2900b5
# Parent  b002a92940ffc985477354a362b2a03f62f7e1b7# Parent  74116beae88a8f17a80301aa6c83865c82f10ece
Merge

diff -r 74116beae88a -r 5fccf867b933 corba/.hgtags
--- a/corba/.hgtags	Wed Jul 05 22:50:10 2017 +0200
+++ b/corba/.hgtags	Thu Feb 23 17:13:57 2017 +0000
@@ -400,3 +400,4 @@
 078ebe23b584466dc8346e620d7821d91751e5a9 jdk-9+154
 a545f54babfa31aa7eb611f36031609acd617cbc jdk-9+155
 907c26240cd481579e919bfd23740797ff8ce1c8 jdk-9+156
+9383da04b385cca46b7ca67f3a39ac1b673e09fe jdk-9+157
diff -r 74116beae88a -r 5fccf867b933 corba/src/java.corba/share/classes/module-info.java
--- a/corba/src/java.corba/share/classes/module-info.java	Wed Jul 05 22:50:10 2017 +0200
+++ b/corba/src/java.corba/share/classes/module-info.java	Thu Feb 23 17:13:57 2017 +0000
@@ -25,6 +25,8 @@
 
 /**
  * Defines the Java binding of the OMG CORBA APIs, and the RMI-IIOP API.
+ *
+ * @since 9
  */
 @Deprecated(since="9", forRemoval=true)
 module java.corba {
diff -r 74116beae88a -r 5fccf867b933 corba/src/java.corba/share/classes/org/omg/CORBA/ORB.java
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/ORB.java	Wed Jul 05 22:50:10 2017 +0200
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/ORB.java	Thu Feb 23 17:13:57 2017 +0000
@@ -106,13 +106,13 @@
  *
  *     <LI>check in properties parameter, if any
  *
- *     <LI>check in the System properties
+ *     <LI>check in the System properties, if any
  *
  *     <LI>check in the orb.properties file located in the user.home
- *         directory (if any)
+ *         directory, if any
  *
- *     <LI>check in the orb.properties file located in the java.home/lib
- *         directory (if any)
+ *     <LI>check in the orb.properties file located in the run-time image,
+ *         if any
  *
  *     <LI>fall back on a hardcoded default behavior (use the Java&nbsp;IDL
  *         implementation)
@@ -170,9 +170,15 @@
  * Thus, where appropriate, it is necessary that
  * the classes for this alternative ORBSingleton are available on the application's class path.
  * It should be noted that the singleton ORB is system wide.
- *
+ * <P>
  * When a per-application ORB is created via the 2-arg init methods,
  * then it will be located using the thread context class loader.
+ * <P>
+ * The IDL to Java Language OMG specification documents the ${java.home}/lib directory as the location,
+ * in the Java run-time image, to search for orb.properties.
+ * This location is not intended for user editable configuration files.
+ * Therefore, the implementation first checks the ${java.home}/conf directory for orb.properties,
+ * and thereafter the ${java.home}/lib directory.
  *
  * @since   JDK1.2
  */
@@ -271,14 +277,25 @@
                     }
 
                     String javaHome = System.getProperty("java.home");
-                    fileName = javaHome + File.separator
-                        + "lib" + File.separator + "orb.properties";
-                    props = getFileProperties( fileName ) ;
+
+                    fileName = javaHome + File.separator + "conf"
+                            + File.separator + "orb.properties";
+                    props = getFileProperties(fileName);
+
+                    if (props != null) {
+                        String value = props.getProperty(name);
+                        if (value != null)
+                            return value;
+                    }
+
+                    fileName = javaHome + File.separator + "lib"
+                            + File.separator + "orb.properties";
+                    props = getFileProperties(fileName);
 
                     if (props == null)
-                        return null ;
+                        return null;
                     else
-                        return props.getProperty( name ) ;
+                        return props.getProperty(name);
                 }
             }
         );