From commits-return-10186-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Tue Feb 10 08:37:55 2009 Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 4235 invoked from network); 10 Feb 2009 08:37:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Feb 2009 08:37:55 -0000 Received: (qmail 58794 invoked by uid 500); 10 Feb 2009 08:37:41 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 58779 invoked by uid 500); 10 Feb 2009 08:37:41 -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 58768 invoked by uid 99); 10 Feb 2009 08:37:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Feb 2009 00:37:41 -0800 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; Tue, 10 Feb 2009 08:37:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D1AE82388AE7; Tue, 10 Feb 2009 08:37:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r742888 - in /activemq/trunk: activemq-optional/src/main/java/org/apache/activemq/transport/util/TextWireFormat.java activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppWireFormat.java Date: Tue, 10 Feb 2009 08:37:16 -0000 To: commits@activemq.apache.org From: dejanb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090210083720.D1AE82388AE7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dejanb Date: Tue Feb 10 08:37:12 2009 New Revision: 742888 URL: http://svn.apache.org/viewvc?rev=742888&view=rev Log: additional fix for https://issues.apache.org/activemq/browse/AMQ-2088 Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/util/TextWireFormat.java activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppWireFormat.java Modified: activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/util/TextWireFormat.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/util/TextWireFormat.java?rev=742888&r1=742887&r2=742888&view=diff ============================================================================== --- activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/util/TextWireFormat.java (original) +++ activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/util/TextWireFormat.java Tue Feb 10 08:37:12 2009 @@ -63,4 +63,9 @@ return unmarshal(dis); } + public boolean inReceive() { + // TODO Implement for inactivity monitor + return false; + } + } Modified: activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppWireFormat.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppWireFormat.java?rev=742888&r1=742887&r2=742888&view=diff ============================================================================== --- activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppWireFormat.java (original) +++ activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppWireFormat.java Tue Feb 10 08:37:12 2009 @@ -216,4 +216,9 @@ public void setVersion(int version) { this.version = version; } + + public boolean inReceive() { + // TODO Implement for inactivity monitor + return false; + } }