summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorBhupendra Bhusman Bhardwaj <bhupendrab@apache.org>2006-12-14 18:40:34 +0000
committerBhupendra Bhusman Bhardwaj <bhupendrab@apache.org>2006-12-14 18:40:34 +0000
commit4b54df7a05fcf9837f2587c64afc24a6981aa6cb (patch)
treef25289dd55763bec157d1e37842472fa9ab2c54c /qpid/java
parentc9c5d35fbe5a97ec0147b025e9ad2e8e63dbb568 (diff)
downloadqpid-python-4b54df7a05fcf9837f2587c64afc24a6981aa6cb.tar.gz
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@487299 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.java2
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java11
2 files changed, 7 insertions, 6 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 407ad236ea..c38f7f630b 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
@@ -305,7 +305,7 @@ public class AMQMinaProtocolSession implements AMQProtocolSession,
return new ArrayList<AMQChannel>(_channelMap.values());
}
- public AMQChannel getChannel(int channelId)
+ public AMQChannel getChannel(int channelId) throws AMQException
{
return _channelMap.get(channelId);
}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
index b56d22d655..a47d462810 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
@@ -187,13 +187,14 @@ public class AMQProtocolSessionMBean extends AMQManagedObject implements Managed
*/
public void closeChannel(int id) throws JMException
{
- AMQChannel channel = _session.getChannel(id);
- if (channel == null)
- {
- throw new JMException("The channel (channel Id = " + id + ") does not exist");
- }
try
{
+ AMQChannel channel = _session.getChannel(id);
+ if (channel == null)
+ {
+ throw new JMException("The channel (channel Id = " + id + ") does not exist");
+ }
+
_session.closeChannel(id);
}
catch (AMQException ex)