You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2015/01/30 18:15:27 UTC

[06/13] qpid-jms git commit: make prefixes constants

make prefixes constants


Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/b338b5a1
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/b338b5a1
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/b338b5a1

Branch: refs/heads/master
Commit: b338b5a1da4180843eea72a435c73ede2cab650e
Parents: af766dc
Author: Robert Gemmell <ro...@apache.org>
Authored: Fri Jan 30 11:33:45 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Fri Jan 30 11:33:45 2015 +0000

----------------------------------------------------------------------
 .../qpid/jms/jndi/JmsInitialContextFactory.java | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b338b5a1/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JmsInitialContextFactory.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JmsInitialContextFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JmsInitialContextFactory.java
index 19515a8..c878e4c 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JmsInitialContextFactory.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JmsInitialContextFactory.java
@@ -54,9 +54,9 @@ public class JmsInitialContextFactory implements InitialContextFactory {
     static final String DEFAULT_REMOTE_URI_PROP = "defaultRemoteURI";
     static final String DEFAULT_REMOTE_URI = "amqp://localhost:5672";
 
-    private String connectionFactoryPrefix = "connectionfactory.";
-    private String queuePrefix = "queue.";
-    private String topicPrefix = "topic.";
+    static final String CONNECTION_FACTORY_KEY_PREFIX = "connectionfactory.";
+    static final String QUEUE_KEY_PREFIX = "queue.";
+    static final String TOPIC_KEY_PREFIX = "topic.";
 
     @SuppressWarnings("unchecked")
     @Override
@@ -122,7 +122,7 @@ public class JmsInitialContextFactory implements InitialContextFactory {
     }
 
     protected JmsConnectionFactory createConnectionFactory(String name, String defaultRemoteURI, Hashtable<Object, Object> environment) throws URISyntaxException {
-        String cfNameKey = connectionFactoryPrefix + name;
+        String cfNameKey = CONNECTION_FACTORY_KEY_PREFIX + name;
         Map<String, String> props = new LinkedHashMap<String, String>();
 
         // Use the default URI if none is defined for this factory in the environment
@@ -143,8 +143,8 @@ public class JmsInitialContextFactory implements InitialContextFactory {
         for (Iterator<Entry<Object, Object>> iter = environment.entrySet().iterator(); iter.hasNext();) {
             Map.Entry<Object, Object> entry = iter.next();
             String key = String.valueOf(entry.getKey());
-            if (key.startsWith(connectionFactoryPrefix)) {
-                String jndiName = key.substring(connectionFactoryPrefix.length());
+            if (key.startsWith(CONNECTION_FACTORY_KEY_PREFIX)) {
+                String jndiName = key.substring(CONNECTION_FACTORY_KEY_PREFIX.length());
                 list.add(jndiName);
             }
         }
@@ -161,8 +161,8 @@ public class JmsInitialContextFactory implements InitialContextFactory {
         for (Iterator<Entry<Object, Object>> iter = environment.entrySet().iterator(); iter.hasNext();) {
             Map.Entry<Object, Object> entry = iter.next();
             String key = entry.getKey().toString();
-            if (key.startsWith(queuePrefix)) {
-                String jndiName = key.substring(queuePrefix.length());
+            if (key.startsWith(QUEUE_KEY_PREFIX)) {
+                String jndiName = key.substring(QUEUE_KEY_PREFIX.length());
                 bindings.put(jndiName, createQueue(entry.getValue().toString()));
             }
         }
@@ -172,8 +172,8 @@ public class JmsInitialContextFactory implements InitialContextFactory {
         for (Iterator<Entry<Object, Object>> iter = environment.entrySet().iterator(); iter.hasNext();) {
             Map.Entry<Object, Object> entry = iter.next();
             String key = entry.getKey().toString();
-            if (key.startsWith(topicPrefix)) {
-                String jndiName = key.substring(topicPrefix.length());
+            if (key.startsWith(TOPIC_KEY_PREFIX)) {
+                String jndiName = key.substring(TOPIC_KEY_PREFIX.length());
                 bindings.put(jndiName, createTopic(entry.getValue().toString()));
             }
         }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org