- Send the ConnectionInfo first before sending the BrokerInfo in the DemandForwardingBridge, so it would work in http.

- Enabled the TwoBrokerTopicSendReceiveUsingHttpTest.
- Added a sleep to the test to give jetty enough time to setup before sending messages.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@386738 13f79535-47bb-0310-9956-ffa450edef68

activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java

@@ -173,8 +173,10 @@ public abstract class DemandForwardingBridgeSupport implements Bridge {
             localClientId="NC_"+remoteBrokerName+"_inbound"+name;
             localConnectionInfo.setClientId(localClientId);
             localBroker.oneway(localConnectionInfo);
+
             localSessionInfo=new SessionInfo(localConnectionInfo,1);
             localBroker.oneway(localSessionInfo);
+            
             log.info("Network connection between "+localBroker+" and "+remoteBroker+"("+remoteBrokerName
                             +") has been established.");
             startedLatch.countDown();
@@ -184,18 +186,23 @@ public abstract class DemandForwardingBridgeSupport implements Bridge {
 
     protected void startRemoteBridge() throws IOException {
         if(remoteBridgeStarted.compareAndSet(false,true)){
-            BrokerInfo brokerInfo=new BrokerInfo();
+
-            brokerInfo.setBrokerName(localBrokerName);
-            remoteBroker.oneway(brokerInfo);
             remoteConnectionInfo=new ConnectionInfo();
             remoteConnectionInfo.setConnectionId(new ConnectionId(idGenerator.generateId()));
             remoteConnectionInfo.setClientId("NC_"+localBrokerName+"_outbound"+name);
             remoteBroker.oneway(remoteConnectionInfo);
+
+            BrokerInfo brokerInfo=new BrokerInfo();
+            brokerInfo.setBrokerName(localBrokerName);
+            remoteBroker.oneway(brokerInfo);
+
             SessionInfo remoteSessionInfo=new SessionInfo(remoteConnectionInfo,1);
             remoteBroker.oneway(remoteSessionInfo);
+
             producerInfo=new ProducerInfo(remoteSessionInfo,1);
             producerInfo.setResponseRequired(false);
             remoteBroker.oneway(producerInfo);
+
             // Listen to consumer advisory messages on the remote broker to determine demand.
             demandConsumerInfo=new ConsumerInfo(remoteSessionInfo,1);
             demandConsumerInfo.setDispatchAsync(dispatchAsync);
@@ -203,6 +210,7 @@ public abstract class DemandForwardingBridgeSupport implements Bridge {
                             +destinationFilter));
             demandConsumerInfo.setPrefetchSize(prefetchSize);
             remoteBroker.oneway(demandConsumerInfo);
+
             startedLatch.countDown();
         }
     }

assembly/project.xml

@@ -323,8 +323,6 @@
       <excludes>
           <!-- http://jira.activemq.org/jira/browse/AMQ-586: fails on Windows 2003 -->
           <exclude>**/TwoBrokerTopicSendReceiveTest.*</exclude>
-          <!-- http://jira.activemq.org/jira/browse/AMQ-563: HTTP not yet implemented -->
-          <exclude>**/TwoBrokerTopicSendReceiveUsingHttpTest.*</exclude>
           <!-- http://jira.activemq.org/jira/browse/AMQ-537 --> 
           <exclude>**/PublishOnQueueConsumedMessageUsingActivemqXMLTest.*</exclude>
           <!-- http://jira.activemq.org/jira/browse/AMQ-538 --> 

assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingHttpTest.java

@@ -25,6 +25,14 @@ import javax.jms.JMSException;
  */
 public class TwoBrokerTopicSendReceiveUsingHttpTest extends TwoBrokerTopicSendReceiveTest {
 
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        // Give jetty server enough time to setup,
+        // so we don't lose messages when connection fails
+        Thread.sleep(5000);
+    }
+
     protected ActiveMQConnectionFactory createReceiverConnectionFactory() throws JMSException {
         return createConnectionFactory("org/apache/activemq/usecases/receiver-http.xml", "receiver", "vm://receiver");
     }