You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by bh...@apache.org on 2006/12/14 19:40:35 UTC

svn commit: r487299 - in /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol: AMQMinaProtocolSession.java AMQProtocolSessionMBean.java

Author: bhupendrab
Date: Thu Dec 14 10:40:34 2006
New Revision: 487299

URL: http://svn.apache.org/viewvc?view=rev&rev=487299
Log: (empty)

Modified:
    incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
    incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java

Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java?view=diff&rev=487299&r1=487298&r2=487299
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java Thu Dec 14 10:40:34 2006
@@ -305,7 +305,7 @@
         return new ArrayList<AMQChannel>(_channelMap.values());
     }
 
-    public AMQChannel getChannel(int channelId)
+    public AMQChannel getChannel(int channelId) throws AMQException
     {
         return _channelMap.get(channelId);
     }

Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java?view=diff&rev=487299&r1=487298&r2=487299
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java Thu Dec 14 10:40:34 2006
@@ -187,13 +187,14 @@
      */
     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)