# HG changeset patch
# User andrew
# Date 1372303630 18000
# Node ID dad642e0105e4474557508b0681150970e5c2923
# Parent  ecf953aa6ea6dba301ccf24faab166f9811c9b26
8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail
Reviewed-by: dfuchs, dholmes

diff -r ecf953aa6ea6 -r dad642e0105e src/share/classes/javax/management/StandardEmitterMBean.java
--- a/src/share/classes/javax/management/StandardEmitterMBean.java	Fri Mar 15 20:35:51 2013 +0900
+++ b/src/share/classes/javax/management/StandardEmitterMBean.java	Wed Jun 26 22:27:10 2013 -0500
@@ -258,8 +258,13 @@
     }
 
     public MBeanNotificationInfo[] getNotificationInfo() {
-        if (notificationInfo == null || notificationInfo.length == 0) {
+        // this getter might get called from the super constructor
+        // when the notificationInfo has not been properly set yet
+        if (notificationInfo == null) {
             return NO_NOTIFICATION_INFO;
+        }
+        if (notificationInfo.length == 0) {
+            return notificationInfo;
         } else {
             return notificationInfo.clone();
         }