Mercurial > hg > release > icedtea-1.9

view patches/security/icedtea-6656633.patch @ 1768:3a122c249dda

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Port latest security fixes from IcedTea6. 2009-04-06 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Add new patches. * patches/security/icedtea-6536193.patch, * patches/security/icedtea-6610888.patch, * patches/security/icedtea-6610896.patch, * patches/security/icedtea-6630639.patch, * patches/security/icedtea-6632886.patch, * patches/security/icedtea-6636360.patch, * patches/security/icedtea-6652463.patch, * patches/security/icedtea-6656633.patch, * patches/security/icedtea-6658158.patch, * patches/security/icedtea-6691246.patch, * patches/security/icedtea-6717680.patch, * patches/security/icedtea-6721651.patch, * patches/security/icedtea-6737315.patch, * patches/security/icedtea-6792554.patch, * patches/security/icedtea-6804996.patch, * patches/security/icedtea-6804997.patch, * patches/security/icedtea-6804998.patch: Security patches ported from IcedTea6.
author Andrew John Hughes <ahughes@redhat.com>
date Tue, 07 Apr 2009 01:02:17 +0100
parents
children
line wrap: on
line source

diff -Nru openjdk.orig/jdk/src/share/classes/javax/management/monitor/CounterMonitor.java openjdk/jdk/src/share/classes/javax/management/monitor/CounterMonitor.java
--- openjdk.orig/jdk/src/share/classes/javax/management/monitor/CounterMonitor.java	2009-04-06 17:20:14.000000000 +0100
+++ openjdk/jdk/src/share/classes/javax/management/monitor/CounterMonitor.java	2009-04-06 17:28:19.000000000 +0100
@@ -599,7 +599,7 @@
      */
 
     public MBeanNotificationInfo[] getNotificationInfo() {
-        return notifsInfo;
+        return notifsInfo.clone();
     }
 
     /*
diff -Nru openjdk.orig/jdk/src/share/classes/javax/management/monitor/GaugeMonitor.java openjdk/jdk/src/share/classes/javax/management/monitor/GaugeMonitor.java
--- openjdk.orig/jdk/src/share/classes/javax/management/monitor/GaugeMonitor.java	2009-04-06 17:20:14.000000000 +0100
+++ openjdk/jdk/src/share/classes/javax/management/monitor/GaugeMonitor.java	2009-04-06 17:28:19.000000000 +0100
@@ -481,7 +481,7 @@
      */
 
     public MBeanNotificationInfo[] getNotificationInfo() {
-        return notifsInfo;
+        return notifsInfo.clone();
     }
 
     /*
diff -Nru openjdk.orig/jdk/src/share/classes/javax/management/monitor/StringMonitor.java openjdk/jdk/src/share/classes/javax/management/monitor/StringMonitor.java
--- openjdk.orig/jdk/src/share/classes/javax/management/monitor/StringMonitor.java	2009-04-06 17:20:14.000000000 +0100
+++ openjdk/jdk/src/share/classes/javax/management/monitor/StringMonitor.java	2009-04-06 17:28:20.000000000 +0100
@@ -184,6 +184,7 @@
      * @return The derived gauge of the specified object.
      *
      */
+    @Override
     public synchronized String getDerivedGauge(ObjectName object) {
         return (String) super.getDerivedGauge(object);
     }
@@ -199,6 +200,7 @@
      * @return The derived gauge timestamp of the specified object.
      *
      */
+    @Override
     public synchronized long getDerivedGaugeTimeStamp(ObjectName object) {
         return super.getDerivedGaugeTimeStamp(object);
     }
@@ -341,8 +343,9 @@
      * the Java class of the notification and the notification types sent by
      * the string monitor.
      */
+    @Override
     public MBeanNotificationInfo[] getNotificationInfo() {
-        return notifsInfo;
+        return notifsInfo.clone();
     }
 
     /*