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 1B73D10CB2 for ; Mon, 7 Apr 2014 14:58:23 +0000 (UTC) Received: (qmail 4839 invoked by uid 500); 7 Apr 2014 14:58:21 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 4307 invoked by uid 500); 7 Apr 2014 14:58:17 -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 4110 invoked by uid 99); 7 Apr 2014 14:58:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Apr 2014 14:58:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E78E194C710; Mon, 7 Apr 2014 14:58:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tabish@apache.org To: commits@activemq.apache.org Message-Id: <919678b82b7f450b944dcfb53313c855@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: https://issues.apache.org/jira/browse/AMQ-5138 Date: Mon, 7 Apr 2014 14:58:15 +0000 (UTC) Repository: activemq Updated Branches: refs/heads/trunk 3adffc18e -> 307005ab4 https://issues.apache.org/jira/browse/AMQ-5138 Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/307005ab Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/307005ab Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/307005ab Branch: refs/heads/trunk Commit: 307005ab4fbaff36c1ff1be6959c4a3371d62a85 Parents: 3adffc1 Author: Timothy Bish Authored: Mon Apr 7 10:58:08 2014 -0400 Committer: Timothy Bish Committed: Mon Apr 7 10:58:08 2014 -0400 ---------------------------------------------------------------------- .../activemq/transport/vm/VMTransport.java | 21 +++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/307005ab/activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransport.java ---------------------------------------------------------------------- diff --git a/activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransport.java b/activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransport.java index e73af12..ba6ed13 100755 --- a/activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransport.java +++ b/activemq-broker/src/main/java/org/apache/activemq/transport/vm/VMTransport.java @@ -75,6 +75,7 @@ public class VMTransport implements Transport, Task { this.peer = peer; } + @Override public void oneway(Object command) throws IOException { if (disposed.get()) { @@ -137,6 +138,7 @@ public class VMTransport implements Transport, Task { transportListener.onCommand(command); } + @Override public void start() throws Exception { if (transportListener == null) { @@ -165,6 +167,7 @@ public class VMTransport implements Transport, Task { } } + @Override public void stop() throws Exception { // Only need to do this once, all future oneway calls will now // fail as will any asnyc jobs in the task runner. @@ -187,7 +190,7 @@ public class VMTransport implements Transport, Task { tr.shutdown(TimeUnit.SECONDS.toMillis(1)); } catch(Exception e) { } - taskRunner = null; + tr = null; } // let the peer know that we are disconnecting after attempting @@ -226,6 +229,7 @@ public class VMTransport implements Transport, Task { /** * @see org.apache.activemq.thread.Task#iterate() */ + @Override public boolean iterate() { final TransportListener tl = transportListener; @@ -249,6 +253,7 @@ public class VMTransport implements Transport, Task { } } + @Override public void setTransportListener(TransportListener commandListener) { this.transportListener = commandListener; } @@ -300,22 +305,27 @@ public class VMTransport implements Transport, Task { return result; } + @Override public FutureResponse asyncRequest(Object command, ResponseCallback responseCallback) throws IOException { throw new AssertionError("Unsupported Method"); } + @Override public Object request(Object command) throws IOException { throw new AssertionError("Unsupported Method"); } + @Override public Object request(Object command, int timeout) throws IOException { throw new AssertionError("Unsupported Method"); } + @Override public TransportListener getTransportListener() { return transportListener; } + @Override public T narrow(Class target) { if (target.isAssignableFrom(getClass())) { return target.cast(this); @@ -344,6 +354,7 @@ public class VMTransport implements Transport, Task { return location + "#" + id; } + @Override public String getRemoteAddress() { if (peer != null) { return peer.toString(); @@ -379,34 +390,42 @@ public class VMTransport implements Transport, Task { this.asyncQueueDepth = asyncQueueDepth; } + @Override public boolean isFaultTolerant() { return false; } + @Override public boolean isDisposed() { return disposed.get(); } + @Override public boolean isConnected() { return !disposed.get(); } + @Override public void reconnect(URI uri) throws IOException { throw new IOException("Transport reconnect is not supported"); } + @Override public boolean isReconnectSupported() { return false; } + @Override public boolean isUpdateURIsSupported() { return false; } + @Override public void updateURIs(boolean reblance,URI[] uris) throws IOException { throw new IOException("URI update feature not supported"); } + @Override public int getReceiveCounter() { return receiveCounter; }