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

*** 172,181 ****
--- 172,187 ----
   * It should be noted that the singleton ORB is system wide.
   *
   * When a per-application ORB is created via the 2-arg init methods,
   * then it will be located using the thread context class loader.
   * 
+  * 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
   */
  abstract public class ORB {
  
      //
*** 269,286 ****
                          if (value != null)
                              return value ;
                      }
  
                      String javaHome = System.getProperty("java.home");
-                     fileName = javaHome + File.separator
-                         + "lib" + File.separator + "orb.properties";
-                     props = getFileProperties( fileName ) ;
  
                      if (props == null)
!                         return null ;
                      else
!                         return props.getProperty( name ) ;
                  }
              }
          );
  
          return propValue;
--- 275,303 ----
                          if (value != null)
                              return value ;
                      }
  
                      String javaHome = System.getProperty("java.home");
  
+                     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;
                      else
!                         return props.getProperty(name);
                  }
              }
          );
  
          return propValue;