summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorBhupendra Bhusman Bhardwaj <bhupendrab@apache.org>2006-12-19 15:09:50 +0000
committerBhupendra Bhusman Bhardwaj <bhupendrab@apache.org>2006-12-19 15:09:50 +0000
commit7b6cf0020bfb48906f563ca3d1088c7b6983ec67 (patch)
tree58adf665973ed41120e46bac0c6836a49a1ba2f9 /qpid/java
parent5a914f818635425089ea0378120fa27aa6bc211b (diff)
downloadqpid-python-7b6cf0020bfb48906f563ca3d1088c7b6983ec67.tar.gz
QPID-188
Adding unit tests for Java broker JMX functionality git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@488701 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java1
-rw-r--r--qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/MockIoSession.java3
2 files changed, 3 insertions, 1 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
index c38f7f630b..e623d23a79 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
@@ -412,6 +412,7 @@ public class AMQMinaProtocolSession implements AMQProtocolSession,
{
channel.close(this);
}
+ _channelMap.clear();
}
/**
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/MockIoSession.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/MockIoSession.java
index 81dea32a76..cf6366b513 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/MockIoSession.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/MockIoSession.java
@@ -25,6 +25,7 @@ import org.apache.mina.common.support.DefaultCloseFuture;
import org.apache.mina.common.support.DefaultWriteFuture;
import java.net.SocketAddress;
+import java.net.InetSocketAddress;
import java.util.Set;
public class MockIoSession implements IoSession
@@ -151,7 +152,7 @@ public class MockIoSession implements IoSession
public SocketAddress getRemoteAddress()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return new InetSocketAddress("127.0.0.1", 1234); //To change body of implemented methods use File | Settings | File Templates.
}
public SocketAddress getLocalAddress()