You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@activemq.apache.org by ch...@apache.org on 2010/11/01 14:04:03 UTC

svn commit: r1029632 - /activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala

Author: chirino
Date: Mon Nov  1 13:04:03 2010
New Revision: 1029632

URL: http://svn.apache.org/viewvc?rev=1029632&view=rev
Log:
Fixes error creating subscription /w stomp 1.0 clients.

Modified:
    activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala?rev=1029632&r1=1029631&r2=1029632&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala Mon Nov  1 13:04:03 2010
@@ -669,13 +669,14 @@ class StompProtocolHandler extends Proto
         val subscription_id = get(headers, ID)
         var id:AsciiBuffer = subscription_id match {
           case None =>
-            if( protocol_version eq V1_0 )
+            if( protocol_version eq V1_0 ) {
               // in 1.0 it's ok if the client does not send us the
               // the id header
               dest
-            else
+            } else {
               die("The id header is missing from the SUBSCRIBE frame");
               return
+            }
 
           case Some(x:AsciiBuffer)=> x
         }