From 09f414379d92ebd0284165851f17728b4307e5bd Mon Sep 17 00:00:00 2001
From: Jaroslav Bachorik <jbachorik@openjdk.org>
Date: Mon, 18 Mar 2013 11:17:06 +0100
Subject: [PATCH] 8009996: tests javax/management/mxbean/MiscTest.java and
 javax/management/mxbean/StandardMBeanOverrideTest.java fail

Reviewed-by: dfuchs, dholmes
---
 .../share/classes/javax/management/StandardEmitterMBean.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/jdk/src/share/classes/javax/management/StandardEmitterMBean.java b/jdk/src/share/classes/javax/management/StandardEmitterMBean.java
index dcebb48d895..a7ac7a11b67 100644
--- a/jdk/src/share/classes/javax/management/StandardEmitterMBean.java
+++ b/jdk/src/share/classes/javax/management/StandardEmitterMBean.java
@@ -258,6 +258,11 @@ public class StandardEmitterMBean extends StandardMBean
     }
 
     public MBeanNotificationInfo[] getNotificationInfo() {
+        // 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 {