diff options
Diffstat (limited to 'qpid/java/management/eclipse-plugin/src/main')
2 files changed, 24 insertions, 13 deletions
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java index 963a821864..64a9068357 100644 --- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java +++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java @@ -47,7 +47,7 @@ public abstract class ApplicationRegistry //max supported broker management interface supported by this release of the management console public static final int SUPPORTED_QPID_JMX_API_MAJOR_VERSION = 2; - public static final int SUPPORTED_QPID_JMX_API_MINOR_VERSION = 4; + public static final int SUPPORTED_QPID_JMX_API_MINOR_VERSION = 5; public static final String DATA_DIR = System.getProperty("user.home") + File.separator + ".qpidmc"; diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java index ba4e091b73..737895958f 100644 --- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java +++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java @@ -404,13 +404,8 @@ public class ViewUtility private static void convertByteArray(FormToolkit toolkit, Composite compositeHolder, CompositeData data, String itemName, String encoding) { - Byte[] arrayItems = (Byte[])data.get(itemName); - byte[] byteArray = new byte[arrayItems.length]; + byte[] byteArray = getByteArray(data, itemName); - for (int i = 0; i < arrayItems.length; i++) - { - byteArray[i] = arrayItems[i]; - } try { String textMessage = new String(byteArray, encoding); @@ -427,6 +422,27 @@ public class ViewUtility } } + private static byte[] getByteArray(CompositeData data, String itemName) + { + byte[] byteArray; + Object binaryData = data.get(itemName); + + if(binaryData instanceof byte[]) + { + byteArray = (byte[]) binaryData; + } + else + { + Byte[] objectArray = (Byte[]) binaryData; + byteArray = new byte[objectArray.length]; + for(int i = 0; i < objectArray.length; i++) + { + byteArray[i] = objectArray[i]; + } + } + return byteArray; + } + private static Shell getShell() { Shell shell = Display.getCurrent().getActiveShell(); @@ -462,13 +478,8 @@ public class ViewUtility private static void handleBinaryMessageContent(FormToolkit toolkit, Composite compositeHolder, CompositeData data, String itemName, String encoding) { final String thisEncoding = encoding; - final Byte[] arrayItems = (Byte[]) data.get(itemName); - final byte[] byteArray = new byte[arrayItems.length]; - for (int i = 0; i < arrayItems.length; i++) - { - byteArray[i] = arrayItems[i]; - } + final byte[] byteArray = getByteArray(data, itemName); try { |