Author: robbie
Date: Mon Nov 9 10:57:55 2009
New Revision: 834014
URL: http://svn.apache.org/viewvc?rev=834014&view=rev
Log:
QPID-2190: when management versioning using both the ServerInformation and
UserManagement mbeans fails, classify the version as 1.0 instead of failing
Modified:
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java
Modified:
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java?rev=834014&r1=834013&r2=834014&view=diff
==============================================================================
---
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
(original)
+++
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
Mon Nov 9 10:57:55 2009
@@ -520,7 +520,7 @@
* @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 @@
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)
Modified:
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java?rev=834014&r1=834013&r2=834014&view=diff
==============================================================================
---
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java
(original)
+++
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/connection/ConnectionOperationsTabControl.java
Mon Nov 9 10:57:55 2009
@@ -180,7 +180,7 @@
{
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;
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
