From 65e40d03dab60518072515670a87b4d2471badaf Mon Sep 17 00:00:00 2001
From: "Hiram R. Chirino" <chirino@apache.org>
Date: Mon, 19 Jun 2006 16:03:50 +0000
Subject: [PATCH] The ItStillMarshallsTheSameTest looks like it's passing Also
 did some work to get the http://jira.activemq.org/jira/browse/AMQ-522 to
 pass.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@415356 13f79535-47bb-0310-9956-ffa450edef68
---
 activemq-core/pom.xml                                       | 3 ---
 .../main/java/org/apache/activemq/proxy/ProxyConnector.java | 6 +++++-
 .../java/org/apache/activemq/proxy/ProxyTestSupport.java    | 2 ++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
index 9cfc5d9822..a7e400e7bb 100755
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@@ -221,9 +221,6 @@
             <!-- These are performance tests so take too long to run -->
             <exclude>**/perf/*</exclude>
                 
-            <!-- This test currently fails -->
-            <exclude>**/ItStillMarshallsTheSameTest.*</exclude>
-                
             <!-- http://jira.activemq.org/jira/browse/AMQ-522 -->
             <exclude>**/ProxyConnectorTest.*</exclude>
                 
diff --git a/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java b/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java
index bccacc98cf..3382cb38c7 100644
--- a/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java
+++ b/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java
@@ -152,7 +152,11 @@ public class ProxyConnector implements Service {
 
     public String getName() {
         if( name == null ) {
-            name = server.getConnectURI().toString();
+            if( server!=null ) {
+                name = server.getConnectURI().toString();
+            } else {
+                name = "proxy";
+            }
         }
         return name;
     }
diff --git a/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyTestSupport.java b/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyTestSupport.java
index 7d44f40fbb..4e8ca7c182 100755
--- a/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyTestSupport.java
+++ b/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyTestSupport.java
@@ -50,6 +50,7 @@ public class ProxyTestSupport extends BrokerTestSupport {
 
         connector = service.addConnector(getLocalURI());
         proxyConnector=new ProxyConnector();
+        proxyConnector.setName("proxy");
         proxyConnector.setBind(new URI(getLocalProxyURI()));
         proxyConnector.setRemote(new URI("fanout:static://"+getRemoteURI()));
         service.addProxyConnector(proxyConnector);
@@ -64,6 +65,7 @@ public class ProxyTestSupport extends BrokerTestSupport {
 
         remoteConnector = service.addConnector(getRemoteURI());
         remoteProxyConnector = new ProxyConnector();
+        remoteProxyConnector.setName("remoteProxy");
         remoteProxyConnector.setBind(new URI(getRemoteProxyURI()));
         remoteProxyConnector.setRemote(new URI("fanout:static://"+getLocalURI()));
         service.addProxyConnector(remoteProxyConnector);