# HG changeset patch
# User andrew
# Date 1371200704 -3600
# Node ID c00efeece9f2bc82f8b4a588f57a606355fab9c0
# Parent  649b424bb842c2c1195119d68293046879dd6303
Handle NullPointerException in getNotificationInfo

diff -r 649b424bb842 -r c00efeece9f2 src/share/classes/javax/management/StandardEmitterMBean.java
--- a/src/share/classes/javax/management/StandardEmitterMBean.java	Wed Jun 12 11:48:21 2013 +0100
+++ b/src/share/classes/javax/management/StandardEmitterMBean.java	Fri Jun 14 10:05:04 2013 +0100
@@ -258,8 +258,8 @@
     }
 
     public MBeanNotificationInfo[] getNotificationInfo() {
-        if (notificationInfo.length == 0) {
-            return notificationInfo;
+        if (notificationInfo == null || notificationInfo.length == 0) {
+            return NO_NOTIFICATION_INFO;
         } else {
             return notificationInfo.clone();
         }