svn commit: r646395 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms: JmsConnector.java JmsQueueConnector.java JmsTopicConnector.java

[rajdavies]

Author: rajdavies
Date: Wed Apr  9 08:03:42 2008
New Revision: 646395

URL: http://svn.apache.org/viewvc?rev=646395&view=rev
Log:
Fix for https://issues.apache.org/activemq/browse/AMQ-1456

Modified:
    
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsConnector.java
    
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java
    
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java

Modified: 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsConnector.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsConnector.java?rev=646395&r1=646394&r2=646395&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsConnector.java
 (original)
+++ 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsConnector.java
 Wed Apr  9 08:03:42 2008
@@ -59,6 +59,8 @@
     protected String outboundPassword;
     protected String localUsername;
     protected String localPassword;
+    protected String outboundClientId;
+    protected String localClientId;
     protected LRUCache replyToBridges = createLRUCache();
 
     private List<DestinationBridge> inboundBridges = new 
CopyOnWriteArrayList<DestinationBridge>();
@@ -277,7 +279,36 @@
     public void setOutboundUsername(String outboundUsername) {
         this.outboundUsername = outboundUsername;
     }
+    
+    /**
+     * @return the outboundClientId
+     */
+    public String getOutboundClientId() {
+        return outboundClientId;
+    }
+
+    /**
+     * @param outboundClientId the outboundClientId to set
+     */
+    public void setOutboundClientId(String outboundClientId) {
+        this.outboundClientId = outboundClientId;
+    }
 
+    /**
+     * @return the localClientId
+     */
+    public String getLocalClientId() {
+        return localClientId;
+    }
+
+    /**
+     * @param localClientId the localClientId to set
+     */
+    public void setLocalClientId(String localClientId) {
+        this.localClientId = localClientId;
+    }
+    
+    
     protected void addInboundBridge(DestinationBridge bridge) {
         inboundBridges.add(bridge);
     }

Modified: 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java?rev=646395&r1=646394&r2=646395&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java
 (original)
+++ 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java
 Wed Apr  9 08:03:42 2008
@@ -210,6 +210,9 @@
                 }
             }
         }
+        if (localClientId != null && localClientId.length() > 0) {
+            outboundQueueConnection.setClientID(getOutboundClientId());
+        }
         outboundQueueConnection.start();
     }
 
@@ -242,6 +245,9 @@
                     localQueueConnection = 
localQueueConnectionFactory.createQueueConnection();
                 }
             }
+        }
+        if (localClientId != null && localClientId.length() > 0) {
+            localQueueConnection.setClientID(getLocalClientId());
         }
         localQueueConnection.start();
     }

Modified: 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java?rev=646395&r1=646394&r2=646395&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java
 (original)
+++ 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java
 Wed Apr  9 08:03:42 2008
@@ -210,6 +210,9 @@
                 }
             }
         }
+        if (localClientId != null && localClientId.length() > 0) {
+            outboundTopicConnection.setClientID(getOutboundClientId());
+        }
         outboundTopicConnection.start();
     }
 
@@ -242,6 +245,9 @@
                     localTopicConnection = 
localTopicConnectionFactory.createTopicConnection();
                 }
             }
+        }
+        if (localClientId != null && localClientId.length() > 0) {
+            localTopicConnection.setClientID(getLocalClientId());
         }
         localTopicConnection.start();
     }