Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 43760 invoked from network); 6 Mar 2006 12:13:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 6 Mar 2006 12:13:25 -0000 Received: (qmail 35924 invoked by uid 500); 6 Mar 2006 12:14:11 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 35893 invoked by uid 500); 6 Mar 2006 12:14:11 -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 35884 invoked by uid 99); 6 Mar 2006 12:14:11 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Mar 2006 04:14:11 -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; Mon, 06 Mar 2006 04:14:10 -0800 Received: (qmail 43665 invoked by uid 65534); 6 Mar 2006 12:13:03 -0000 Message-ID: <20060306121303.43659.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r383523 - in /incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport: TransportThreadSupport.java tcp/TcpTransport.java Date: Mon, 06 Mar 2006 12:13:00 -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: Mon Mar 6 04:12:53 2006 New Revision: 383523 URL: http://svn.apache.org/viewcvs?rev=383523&view=rev Log: added extra test to ensure that the transport instance is fully started before attempts are made to use the transport Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportThreadSupport.java incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportThreadSupport.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportThreadSupport.java?rev=383523&r1=383522&r2=383523&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportThreadSupport.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportThreadSupport.java Mon Mar 6 04:12:53 2006 @@ -16,6 +16,8 @@ */ package org.apache.activemq.transport; +import org.apache.activemq.command.Command; +import org.apache.activemq.command.ShutdownInfo; import org.apache.activemq.util.ServiceStopper; import java.io.IOException; @@ -81,9 +83,12 @@ protected abstract void doStop(ServiceStopper stopper) throws Exception; - protected void checkStarted() { + protected void checkStarted(Command command) { if (!isStarted()) { - throw new IllegalStateException("The transport " + this + " of type: " + getClass().getName() + " has not been started yet!"); + // we might try to shut down the transport before it was ever started in some test cases + if (!(command instanceof ShutdownInfo)) { + throw new IllegalStateException("The transport " + this + " of type: " + getClass().getName() + " has not been started yet!"); + } } } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java?rev=383523&r1=383522&r2=383523&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java Mon Mar 6 04:12:53 2006 @@ -112,6 +112,7 @@ * A one way asynchronous send */ public void oneway(Command command) throws IOException { + checkStarted(command); wireFormat.marshal(command, dataOut); dataOut.flush(); }