You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2009/10/01 22:50:07 UTC
svn commit: r820784 -
/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/InitialContext.java
Author: tellison
Date: Thu Oct 1 20:50:07 2009
New Revision: 820784
URL: http://svn.apache.org/viewvc?rev=820784&view=rev
Log:
Ensure libProperties cannot be used while it is being initialized.
Modified:
harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/InitialContext.java
Modified: harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/InitialContext.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/InitialContext.java?rev=820784&r1=820783&r2=820784&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/InitialContext.java (original)
+++ harmony/enhanced/classlib/trunk/modules/jndi/src/main/java/javax/naming/InitialContext.java Thu Oct 1 20:50:07 2009
@@ -226,8 +226,9 @@
// 4.2 Read "java.home"/lib/jndi.properties
if (libProperties == null) {
- libProperties = new Hashtable<Object, Object>();
- EnvironmentReader.readLibraryResourceFile(libProperties);
+ Hashtable<Object, Object> props = new Hashtable<Object, Object>();
+ EnvironmentReader.readLibraryResourceFile(props);
+ libProperties = props;
}
EnvironmentReader.mergeEnvironment(libProperties, myProps, true);