Merge pull request hornetq#1266 from FranciscoBorges/master

Fix hanging test (ProtonTest was hanging because of missing protocol in ...
FranciscoBorges · Sep 10, 2013 · 856da05 · 856da05
2 parents 0abd037 + b55ddd8
commit 856da05
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/hornetq-server/src/main/java/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java b/hornetq-server/src/main/java/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java
@@ -243,7 +243,10 @@ public ClassLoader run()
                   info.getParams());
 
             ProtocolManager manager = protocolMap.get(protocol);
-
+            if (manager == null)
+            {
+               throw HornetQMessageBundle.BUNDLE.noProtocolManagerFound(protocol);
+            }
             ClusterConnection clusterConnection = lookupClusterConnection(info);
 
             Acceptor acceptor = factory.createAcceptor(clusterConnection,

diff --git a/hornetq-server/src/main/java/org/hornetq/core/server/HornetQMessageBundle.java b/hornetq-server/src/main/java/org/hornetq/core/server/HornetQMessageBundle.java
@@ -316,7 +316,7 @@ public interface HornetQMessageBundle
 
    @Message(id = 119081, value =  "No Discovery Group configuration named {0} found", format = Message.Format.MESSAGE_FORMAT)
    HornetQException noDiscoveryGroupFound(DiscoveryGroupConfiguration dg);
-   
+
    @Message(id = 119082, value =  "Queue {0} already exists on another subscription", format = Message.Format.MESSAGE_FORMAT)
    HornetQInvalidTransientQueueUseException queueSubscriptionBelongsToDifferentAddress(SimpleString queueName);
 
@@ -327,4 +327,8 @@ public interface HornetQMessageBundle
             format = Message.Format.MESSAGE_FORMAT)
    HornetQClusterSecurityException unableToValidateClusterUser(String user);
 
+   @Message(id = 119085, value = "Classpath lacks a protocol-manager for protocol {0}",
+            format = Message.Format.MESSAGE_FORMAT)
+   HornetQException noProtocolManagerFound(String protocol);
+
 }
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
@@ -72,6 +72,11 @@
          <groupId>org.hornetq</groupId>
          <artifactId>hornetq-journal</artifactId>
          <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.hornetq</groupId>
+         <artifactId>hornetq-amqp-protocol</artifactId>
+         <version>${project.version}</version>
       </dependency>
        <dependency>
            <groupId>org.hornetq</groupId>