Mercurial > hg > release > icedtea7-forest-2.2 > jdk

changeset 5390:dad642e0105e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8009996: tests javax/management/mxbean/MiscTest.java and javax/management/mxbean/StandardMBeanOverrideTest.java fail Reviewed-by: dfuchs, dholmes
author andrew
date Wed, 26 Jun 2013 22:27:10 -0500
parents ecf953aa6ea6
children 1d48c0d0a0a2
files src/share/classes/javax/management/StandardEmitterMBean.java
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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();
         }