From 700f1e45dea9442f751b926db58fb127ec9bf9fb Mon Sep 17 00:00:00 2001
From: Robert Davies <rajdavies@apache.org>
Date: Wed, 3 Feb 2010 13:59:29 +0000
Subject: [PATCH] Further fix for
 https://issues.apache.org/activemq/browse/AMQ-2220

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@906045 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/java/org/apache/activemq/jndi/ReadOnlyContext.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/activemq-core/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java b/activemq-core/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java
index 12d4ba12e4..6d5a9b7538 100755
--- a/activemq-core/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java
+++ b/activemq-core/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java
@@ -97,17 +97,16 @@ public class ReadOnlyContext implements Context, Serializable {
             this.environment = new Hashtable<String, Object>(environment);
         }
         this.bindings = new HashMap<String, Object>();
+        treeBindings = new HashMap<String, Object>();
         if (bindings != null) {
             for (Map.Entry<String, Object> binding : bindings.entrySet()) {
                 try {
                     internalBind(binding.getKey(), binding.getValue());
-                } catch (NamingException e) {
+                } catch (Throwable e) {
                     LOG.error("Failed to bind " + binding.getKey() + "=" + binding.getValue(), e);
                 }
             }
         }
-
-        treeBindings = new HashMap<String, Object>();
         frozen = true;
     }