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

changeset 5370:51692befea2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handle NullPointerException in getNotificationInfo
author andrew
date Fri, 14 Jun 2013 10:05:04 +0100
parents 06ee02f5ca2e
children 3202c8ef7d0c
files src/share/classes/javax/management/StandardEmitterMBean.java
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/javax/management/StandardEmitterMBean.java	Wed Jun 12 13:12:39 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();
         }