diff options
| author | Robert Gemmell <robbie@apache.org> | 2009-11-09 10:57:55 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2009-11-09 10:57:55 +0000 |
| commit | 46509b4c8858d7963f50c8c54db96a63b94c53b3 (patch) | |
| tree | 7cbfe55cffbd18dfaa6da3f9d774ad6ec19aeef7 /qpid/java/management/eclipse-plugin/src | |
| parent | e080dd6b692756af3efb9ff470186b8a3585112f (diff) | |
| download | qpid-python-46509b4c8858d7963f50c8c54db96a63b94c53b3.tar.gz | |
QPID-2190: when management versioning using both the ServerInformation and UserManagement mbeans fails, classify the version as 1.0 instead of failing
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@834014 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/management/eclipse-plugin/src')
2 files changed, 7 insertions, 6 deletions
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java index 5234535fe5..2f5752db9b 100644 --- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java +++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java @@ -520,7 +520,7 @@ public class MBeanUtility * @throws IOException */ public static void classifyManagementApiVersion(ManagedServer server, JMXServerRegistry serverRegistry) - throws ManagementConsoleException, MalformedObjectNameException, NullPointerException, IOException + throws MalformedObjectNameException, NullPointerException, IOException { MBeanServerConnection mbsc = serverRegistry.getServerConnection(); @@ -570,11 +570,12 @@ public class MBeanUtility serverRegistry.setManagementApiVersion(new ApiVersion(1, 1)); } } - - return; } - - throw new ManagementConsoleException("Unable to classify the server management API version"); + else + { + //UserManagement MBean wasnt present, connected to an old server: classify as v1.0 API + serverRegistry.setManagementApiVersion(new ApiVersion(1, 0)); + } } public static void printOutput(String statement) diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java index 220ca28704..3281757526 100644 --- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java +++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java @@ -180,7 +180,7 @@ public class ConnectionOperationsTabControl extends TabControl { titles = new String[]{"Id", "Transactional", "Num Unacked Msg", "Default Queue"}; } - int[] bounds = { 40, 110, 145, 200, 110 }; + int[] bounds = { 50, 110, 145, 200, 110 }; for (int i = 0; i < titles.length; i++) { final int index = i; |