qpid-tool fixed to cleanly handle brokers with management disabled

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@659535 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 4 deletions

diff --git a/python/commands/qpid-tool b/python/commands/qpid-tool
index 478e362aaf..bf16faac42 100755
--- a/python/commands/qpid-tool
+++ b/python/commands/qpid-tool
@@ -164,16 +164,16 @@ try:
 except socket.error, e:
   print "Socket Error (%s):" % _host, e[1]
   sys.exit (1)
-except Closed, e:
-  if str(e).find ("Exchange not found") != -1:
-    print "Management not enabled on broker:  Use '-m yes' option on broker startup."
-  sys.exit (1)
 except IOError, e:
   print "IOError: %d - %s: %s" % (e.errno, e.strerror, e.filename)
   sys.exit (1)
 except ConnectionFailed, e:
   print "Connect Failed %d - %s" % (e[0], e[1])
   sys.exit(1)
+except Exception, e:
+  if str(e).find ("Exchange not found") != -1:
+    print "Management not enabled on broker:  Use '-m yes' option on broker startup."
+  sys.exit(1)
 
 # Instantiate the CLI interpreter and launch it.
 cli = Mcli (data, disp)