Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 54316 invoked from network); 1 Nov 2010 13:04:31 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 1 Nov 2010 13:04:31 -0000 Received: (qmail 76628 invoked by uid 500); 1 Nov 2010 13:05:03 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 76563 invoked by uid 500); 1 Nov 2010 13:05:02 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 76556 invoked by uid 99); 1 Nov 2010 13:05:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Nov 2010 13:05:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Nov 2010 13:05:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C03682388A3B; Mon, 1 Nov 2010 13:04:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1029632 - /activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocol.scala Date: Mon, 01 Nov 2010 13:04:03 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101101130403.C03682388A3B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 }