You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2016/06/15 11:00:04 UTC

activemq git commit: https://issues.apache.org/jira/browse/AMQ-6322 - fix NetworkRouteTest failure

Repository: activemq
Updated Branches:
  refs/heads/master 7b207567d -> 36237cb30


https://issues.apache.org/jira/browse/AMQ-6322 - fix NetworkRouteTest failure


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/36237cb3
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/36237cb3
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/36237cb3

Branch: refs/heads/master
Commit: 36237cb30f703664a75e642b8c4f25b020e9a7a9
Parents: 7b20756
Author: Dejan Bosanac <de...@nighttale.net>
Authored: Wed Jun 15 12:59:52 2016 +0200
Committer: Dejan Bosanac <de...@nighttale.net>
Committed: Wed Jun 15 12:59:52 2016 +0200

----------------------------------------------------------------------
 .../test/java/org/apache/activemq/network/NetworkRouteTest.java    | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/36237cb3/activemq-unit-tests/src/test/java/org/apache/activemq/network/NetworkRouteTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/network/NetworkRouteTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/network/NetworkRouteTest.java
index 0f50afe..2b363b3 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/network/NetworkRouteTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/network/NetworkRouteTest.java
@@ -37,6 +37,7 @@ import org.apache.activemq.transport.FutureResponse;
 import org.apache.activemq.transport.ResponseCallback;
 import org.apache.activemq.transport.Transport;
 import org.apache.activemq.transport.TransportListener;
+import org.apache.activemq.transport.tcp.TcpTransport;
 import org.easymock.EasyMock;
 import org.easymock.IAnswer;
 import org.easymock.IMocksControl;
@@ -206,6 +207,7 @@ public class NetworkRouteTest {
         localBroker.oneway(remoteBrokerInfo);
         EasyMock.expect(localBroker.request(EasyMock.isA(Object.class)))
                 .andReturn(null);
+        EasyMock.expect(remoteBroker.narrow(TcpTransport.class)).andReturn(null);
         localBroker.oneway(EasyMock.isA(Object.class));
         ExpectationWaiter localInitWaiter = ExpectationWaiter.waiterForLastVoidCall();