diff options
Diffstat (limited to 'java/management/eclipse-plugin/src')
2 files changed, 12 insertions, 5 deletions
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java index bd168ed24e..f5b4a22e03 100644 --- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java +++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java @@ -749,7 +749,10 @@ public class OperationTabControl extends TabControl List<String> list = new ArrayList<String>(); for (CompositeData data : records) { - list.add(data.get(USERNAME).toString()); + if (data.containsKey(USERNAME)) + { + list.add(data.get(USERNAME).toString()); + } } return list; diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java index 89ab360937..4f2b70f869 100644 --- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java +++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java @@ -335,11 +335,15 @@ public class ViewUtility if (data.containsKey("MimeType")) { mimeType = (String)data.get("MimeType"); + } + if (data.containsKey("Encoding")) + { encoding = (String)data.get("Encoding"); - if (encoding == null || encoding.length() == 0) - { - encoding = Charset.defaultCharset().name(); - } + } + + if (encoding == null || encoding.length() == 0) + { + encoding = Charset.defaultCharset().name(); } if ("text/plain".equals(mimeType)) |