diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | javax/management/MBeanInfo.java | 24 | ||||
| -rw-r--r-- | javax/management/NotificationBroadcaster.java | 2 | ||||
| -rw-r--r-- | javax/management/NotificationEmitter.java | 6 | ||||
| -rw-r--r-- | javax/management/NotificationFilter.java | 3 | ||||
| -rw-r--r-- | javax/management/NotificationListener.java | 3 | ||||
| -rw-r--r-- | javax/rmi/ssl/SslRMIClientSocketFactory.java | 13 |
7 files changed, 62 insertions, 6 deletions
@@ -1,5 +1,22 @@ 2006-07-16 Andrew John Hughes <gnu_andrew@member.fsf.org> + * javax/management/MBeanInfo.java: + (getNotifications()): Implemented. + * javax/management/NotificationBroadcaster.java: + (removeNotificationListener(NotificationListener)): + Renamed from removeListener. + * javax/management/NotificationEmitter.java: + (removeNotificationListener(NotificationListener, + NotificationFilter, Object)): Likewise. + * javax/management/NotificationFilter.java: + Implement Serializable. + * javax/management/NotificationListener.java: + Implement java.util.EventListener. + * javax/rmi/ssl/SslRMIClientSocketFactory.java: + Implement Serializable. + +2006-07-16 Andrew John Hughes <gnu_andrew@member.fsf.org> + * java/lang/management/MemoryNotificationInfo.java: New file. diff --git a/javax/management/MBeanInfo.java b/javax/management/MBeanInfo.java index 3aad20e31..1fd3951f5 100644 --- a/javax/management/MBeanInfo.java +++ b/javax/management/MBeanInfo.java @@ -104,6 +104,13 @@ public class MBeanInfo private String className; /** + * Descriptions of the notifications emitted by the bean. + * + * @serial The bean's notifications. + */ + private MBeanNotificationInfo[] notifications; + + /** * Returns a shallow clone of the information. This is * simply a new copy of each string and a clone * of each array, which still references the same objects, @@ -149,4 +156,21 @@ public class MBeanInfo return description; } + /** + * Returns descriptions of each of the notifications emitted + * by this management bean. The returned value is a shallow + * copy of the notification array maintained by this instance. + * Hence, changing the elements of the returned array will not + * affect the notification array, and the elements (instances + * of the {@link MBeanNotificationInfo} class) are immutable. + * + * @return an array of {@link MBeanNotificationInfo} objects, + * representing the notifications emitted by this + * management bean. + */ + public MBeanNotificationInfo[] getNotifications() + { + return (MBeanNotificationInfo[]) notifications.clone(); + } + } diff --git a/javax/management/NotificationBroadcaster.java b/javax/management/NotificationBroadcaster.java index 91b5f636a..139d842bb 100644 --- a/javax/management/NotificationBroadcaster.java +++ b/javax/management/NotificationBroadcaster.java @@ -105,7 +105,7 @@ public interface NotificationBroadcaster * @see #addNotificationListener(NotificationListener, NotificationFilter, * java.lang.Object) */ - void removeListener(NotificationListener listener) + void removeNotificationListener(NotificationListener listener) throws ListenerNotFoundException; } diff --git a/javax/management/NotificationEmitter.java b/javax/management/NotificationEmitter.java index bcc3ab90b..002e2fe18 100644 --- a/javax/management/NotificationEmitter.java +++ b/javax/management/NotificationEmitter.java @@ -67,9 +67,9 @@ public interface NotificationEmitter * @see #addNotificationListener(NotificationListener, NotificationFilter, * java.lang.Object) */ - void removeListener(NotificationListener listener, - NotificationFilter filter, - Object passback) + void removeNotificationListener(NotificationListener listener, + NotificationFilter filter, + Object passback) throws ListenerNotFoundException; } diff --git a/javax/management/NotificationFilter.java b/javax/management/NotificationFilter.java index 49d695923..a8e41c93f 100644 --- a/javax/management/NotificationFilter.java +++ b/javax/management/NotificationFilter.java @@ -37,6 +37,8 @@ exception statement from your version. */ package javax.management; +import java.io.Serializable; + /** * Represents a object that acts as a filter for notifications. * Implementations of this class are used to determine which @@ -47,6 +49,7 @@ package javax.management; * @since 1.5 */ public interface NotificationFilter + extends Serializable { /** diff --git a/javax/management/NotificationListener.java b/javax/management/NotificationListener.java index 801f2ac55..69b08eee3 100644 --- a/javax/management/NotificationListener.java +++ b/javax/management/NotificationListener.java @@ -37,6 +37,8 @@ exception statement from your version. */ package javax.management; +import java.util.EventListener; + /** * Represents a object that can receive notifications from * a bean. @@ -45,6 +47,7 @@ package javax.management; * @since 1.5 */ public interface NotificationListener + extends EventListener { /** diff --git a/javax/rmi/ssl/SslRMIClientSocketFactory.java b/javax/rmi/ssl/SslRMIClientSocketFactory.java index 6fcd397dc..1fed5824c 100644 --- a/javax/rmi/ssl/SslRMIClientSocketFactory.java +++ b/javax/rmi/ssl/SslRMIClientSocketFactory.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.rmi.ssl; import java.io.IOException; +import java.io.Serializable; + import java.util.StringTokenizer; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.SSLSocket; @@ -62,8 +64,15 @@ import java.rmi.server.RMIClientSocketFactory; * @author Sven de Marothy * @since 1.5 */ -public class SslRMIClientSocketFactory implements RMIClientSocketFactory +public class SslRMIClientSocketFactory + implements RMIClientSocketFactory, Serializable { + + /** + * Compatible with JDK 1.5 + */ + private static final long serialVersionUID = -8310631444933958385L; + private String[] enabledCipherSuites, enabledProtocols; /** @@ -154,4 +163,4 @@ public class SslRMIClientSocketFactory implements RMIClientSocketFactory hash = hash ^ enabledProtocols[i].hashCode(); return hash; } -}
\ No newline at end of file +} |