Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 14909 invoked from network); 10 Jan 2011 13:30:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 10 Jan 2011 13:30:52 -0000 Received: (qmail 98103 invoked by uid 500); 10 Jan 2011 13:30:52 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 98028 invoked by uid 500); 10 Jan 2011 13:30:50 -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 98021 invoked by uid 99); 10 Jan 2011 13:30:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Jan 2011 13:30:49 +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, 10 Jan 2011 13:30:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0769C2388903; Mon, 10 Jan 2011 13:30:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1057186 - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/proxy/ProxyConnection.java test/java/org/apache/activemq/proxy/ProxyFailoverTest.java Date: Mon, 10 Jan 2011 13:30:27 -0000 To: commits@activemq.apache.org From: dejanb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110110133028.0769C2388903@eris.apache.org> Author: dejanb Date: Mon Jan 10 13:30:27 2011 New Revision: 1057186 URL: http://svn.apache.org/viewvc?rev=1057186&view=rev Log: https://issues.apache.org/jira/browse/AMQ-3119 - proxy connector and failover Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnection.java activemq/trunk/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyFailoverTest.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnection.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnection.java?rev=1057186&r1=1057185&r2=1057186&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnection.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnection.java Mon Jan 10 13:30:27 2011 @@ -21,6 +21,7 @@ import java.util.concurrent.atomic.Atomi import org.apache.activemq.Service; import org.apache.activemq.command.ShutdownInfo; +import org.apache.activemq.command.WireFormatInfo; import org.apache.activemq.transport.DefaultTransportListener; import org.apache.activemq.transport.Transport; import org.apache.activemq.util.IOExceptionSupport; @@ -64,6 +65,10 @@ class ProxyConnection implements Service shuttingDown.set(true); shutdown = true; } + // skipping WireFormat infos + if (command.getClass() == WireFormatInfo.class) { + return; + } try { remoteTransport.oneway(command); if (shutdown) { @@ -84,6 +89,10 @@ class ProxyConnection implements Service this.remoteTransport.setTransportListener(new DefaultTransportListener() { public void onCommand(Object command) { try { + // skipping WireFormat infos + if (command.getClass() == WireFormatInfo.class) { + return; + } localTransport.oneway(command); } catch (IOException error) { onFailure(error); Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyFailoverTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyFailoverTest.java?rev=1057186&r1=1057185&r2=1057186&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyFailoverTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyFailoverTest.java Mon Jan 10 13:30:27 2011 @@ -68,9 +68,8 @@ public class ProxyFailoverTest extends T producer.start(); - ActiveMQConnectionFactory consumerFactory = new ActiveMQConnectionFactory("tcp://localhost:51618?wireFormat.cacheEnabled=false"); - // if used with cached enabled it will fail - //ActiveMQConnectionFactory consumerFactory = new ActiveMQConnectionFactory("tcp://localhost:51618"); + //ActiveMQConnectionFactory consumerFactory = new ActiveMQConnectionFactory("tcp://localhost:51618?wireFormat.cacheEnabled=false"); + ActiveMQConnectionFactory consumerFactory = new ActiveMQConnectionFactory("tcp://localhost:51618"); Connection consumerConnection = consumerFactory.createConnection(); consumerConnection.start(); Session consumerSession = consumerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);