From activemq-commits-return-838-apmail-geronimo-activemq-commits-archive=geronimo.apache.org@geronimo.apache.org Wed Mar 01 17:04:41 2006 Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 96116 invoked from network); 1 Mar 2006 17:04:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 1 Mar 2006 17:04:40 -0000 Received: (qmail 33170 invoked by uid 500); 1 Mar 2006 17:05:26 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 33129 invoked by uid 500); 1 Mar 2006 17:05:26 -0000 Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-commits@geronimo.apache.org Received: (qmail 33120 invoked by uid 99); 1 Mar 2006 17:05:26 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Mar 2006 09:05:26 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 01 Mar 2006 09:05:25 -0800 Received: (qmail 95976 invoked by uid 65534); 1 Mar 2006 17:04:17 -0000 Message-ID: <20060301170417.95971.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r382082 - in /incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp: Connect.java FrameBuilder.java Date: Wed, 01 Mar 2006 17:04:16 -0000 To: activemq-commits@geronimo.apache.org From: jstrachan@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jstrachan Date: Wed Mar 1 09:04:16 2006 New Revision: 382082 URL: http://svn.apache.org/viewcvs?rev=382082&view=rev Log: minor refactor to avoid strange eclipse compile error message Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Connect.java incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/FrameBuilder.java Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Connect.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Connect.java?rev=382082&r1=382081&r2=382082&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Connect.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Connect.java Wed Mar 1 09:04:16 2006 @@ -83,9 +83,13 @@ format.onFullyConnected(); StringBuffer buffer = new StringBuffer(); - buffer.append(Stomp.Responses.CONNECTED).append(Stomp.NEWLINE); - buffer.append(Stomp.Headers.Connected.SESSION).append(Stomp.Headers.SEPERATOR).append(connectionInfo.getClientId()).append(Stomp.NEWLINE).append( - Stomp.NEWLINE); + buffer.append(Stomp.Responses.CONNECTED); + buffer.append(Stomp.NEWLINE); + buffer.append(Stomp.Headers.Connected.SESSION); + buffer.append(Stomp.Headers.SEPERATOR); + buffer.append(connectionInfo.getClientId()); + buffer.append(Stomp.NEWLINE); + buffer.append(Stomp.NEWLINE); buffer.append(Stomp.NULL); out.writeBytes(buffer.toString()); return true; Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/FrameBuilder.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/FrameBuilder.java?rev=382082&r1=382081&r2=382082&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/FrameBuilder.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/FrameBuilder.java Wed Mar 1 09:04:16 2006 @@ -79,7 +79,10 @@ String key = (String) iterator.next(); String property = headers.getProperty(key); if (property != null) { - buffer.append(key).append(Stomp.Headers.SEPERATOR).append(property).append(Stomp.NEWLINE); + buffer.append(key); + buffer.append(Stomp.Headers.SEPERATOR); + buffer.append(property); + buffer.append(Stomp.NEWLINE); } } buffer.append(Stomp.NEWLINE);