Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

applied patch for https://issues.apache.org/activemq/browse/AMQ-2220 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@905958 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Davies 2010-02-03 09:49:21 +00:00
parent 204f91f935
commit 9f2d289bee
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
activemq-core/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java
View File

@ -23,7 +23,6 @@ import java.util.HashMap;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
import javax.naming.Binding; import javax.naming.Binding;
import javax.naming.CompositeName; import javax.naming.CompositeName;
import javax.naming.Context; import javax.naming.Context;
@ -38,6 +37,8 @@ import javax.naming.NotContextException;
import javax.naming.OperationNotSupportedException; import javax.naming.OperationNotSupportedException;
import javax.naming.Reference; import javax.naming.Reference;
import javax.naming.spi.NamingManager; import javax.naming.spi.NamingManager;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/** /**
* A read-only Context <p/> This version assumes it and all its subcontext are * A read-only Context <p/> This version assumes it and all its subcontext are
@ -61,7 +62,7 @@ import javax.naming.spi.NamingManager;
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public class ReadOnlyContext implements Context, Serializable { public class ReadOnlyContext implements Context, Serializable {
private static final Log LOG = LogFactory.getLog(ReadOnlyContext.class);
public static final String SEPARATOR = "/"; public static final String SEPARATOR = "/";
protected static final NameParser NAME_PARSER = new NameParserImpl(); protected static final NameParser NAME_PARSER = new NameParserImpl();
private static final long serialVersionUID = -5754338187296859149L; private static final long serialVersionUID = -5754338187296859149L;
@ -95,7 +96,17 @@ public class ReadOnlyContext implements Context, Serializable {
} else { } else {
this.environment = new Hashtable<String, Object>(environment); this.environment = new Hashtable<String, Object>(environment);
} }
this.bindings = bindings; this.bindings = new HashMap<String, Object>();
if (bindings != null) {
for (Map.Entry<String, Object> binding : bindings.entrySet()) {
try {
internalBind(binding.getKey(), binding.getValue());
} catch (NamingException e) {
LOG.error("Failed to bind " + binding.getKey() + "=" + binding.getValue(), e);
}
}
}
treeBindings = new HashMap<String, Object>(); treeBindings = new HashMap<String, Object>();
frozen = true; frozen = true;
} }
@ -373,7 +384,7 @@ public class ReadOnlyContext implements Context, Serializable {
} }
private abstract class LocalNamingEnumeration implements NamingEnumeration { private abstract class LocalNamingEnumeration implements NamingEnumeration {
private Iterator i = bindings.entrySet().iterator(); private final Iterator i = bindings.entrySet().iterator();
public boolean hasMore() throws NamingException { public boolean hasMore() throws NamingException {
return i.hasNext(); return i.hasNext();