Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4E8A24366 for ; Mon, 23 May 2011 18:26:08 +0000 (UTC) Received: (qmail 29494 invoked by uid 500); 23 May 2011 18:26:08 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 29469 invoked by uid 500); 23 May 2011 18:26:08 -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 29461 invoked by uid 99); 23 May 2011 18:26:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 May 2011 18:26:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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, 23 May 2011 18:26:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1620B2388A6B; Mon, 23 May 2011 18:25:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1126635 - /activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala Date: Mon, 23 May 2011 18:25:46 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110523182546.1620B2388A6B@eris.apache.org> Author: tabish Date: Mon May 23 18:25:45 2011 New Revision: 1126635 URL: http://svn.apache.org/viewvc?rev=1126635&view=rev Log: Fix imports to bring in the OpenwireConnectionStatusDTO instead of the Stomp one, fixes build. Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala?rev=1126635&r1=1126634&r2=1126635&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala Mon May 23 18:25:45 2011 @@ -41,8 +41,8 @@ import security.SecurityContext import tcp.TcpTransport import codec.OpenWireFormat import command._ -import org.apache.activemq.apollo.stomp.dto.StompConnectionStatusDTO -import org.apache.activemq.apollo.dto.{TopicDestinationDTO, DurableSubscriptionDestinationDTO, DestinationDTO, StompConnectionStatusDTO} +import org.apache.activemq.apollo.openwire.dto.OpenwireConnectionStatusDTO +import org.apache.activemq.apollo.dto.{TopicDestinationDTO, DurableSubscriptionDestinationDTO, DestinationDTO} object OpenwireProtocolHandler extends Log { @@ -202,7 +202,7 @@ class OpenwireProtocolHandler extends Pr // } // } // consumers = Map() - trace("stomp protocol resources released") + trace("openwire protocol resources released") } } @@ -862,7 +862,7 @@ class OpenwireProtocolHandler extends Pr assert( !route.full ) route.offer(delivery) if( route.full ) { - // but once it gets full.. suspend, so that we get more stomp messages + // but once it gets full.. suspend, so that we get more messages // until it's not full anymore. suspendRead("blocked destination: "+route.overflowSessions.mkString(", ")) }