summaryrefslogtreecommitdiff
path: root/javax
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2007-04-06 21:03:26 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2007-04-06 21:03:26 +0000
commit44939d3134ed0bcd701a10d74df6e9b8326faea5 (patch)
treeb47d1f1c0aa6f4b30413194b14f09b7c9f7c3f8d /javax
parent79d1138c43e1e19fbb78adc81b5a3c29d482c240 (diff)
downloadclasspath-44939d3134ed0bcd701a10d74df6e9b8326faea5.tar.gz
2007-04-06 Andrew John Hughes <gnu_andrew@member.fsf.org>
* javax/management/MBeanAttributeInfo.java: (serialVersionUID): Added. * javax/management/MBeanFeatureInfo.java: (writeObject(ObjectOutputStream)): Added for later 1.6 support. * javax/management/Notification.java: (serialVersionUID): Added. (Notification(String,Object,long,long)): Make default message the empty string not null. (Notification(String,Object,long,long,String)): Set source explicitly. (writeObject(ObjectOutputStream)): Added to match Sun.
Diffstat (limited to 'javax')
-rw-r--r--javax/management/MBeanAttributeInfo.java5
-rw-r--r--javax/management/MBeanFeatureInfo.java15
-rw-r--r--javax/management/Notification.java23
3 files changed, 42 insertions, 1 deletions
diff --git a/javax/management/MBeanAttributeInfo.java b/javax/management/MBeanAttributeInfo.java
index 2d7c100b5..2e8475ea0 100644
--- a/javax/management/MBeanAttributeInfo.java
+++ b/javax/management/MBeanAttributeInfo.java
@@ -55,6 +55,11 @@ public class MBeanAttributeInfo
{
/**
+ * Compatible with JDK 1.6
+ */
+ private static final long serialVersionUID = 8644704819898565848L;
+
+ /**
* The type of the attribute.
*
* @serial the attribute type.
diff --git a/javax/management/MBeanFeatureInfo.java b/javax/management/MBeanFeatureInfo.java
index 74a030387..b3d60d25d 100644
--- a/javax/management/MBeanFeatureInfo.java
+++ b/javax/management/MBeanFeatureInfo.java
@@ -37,6 +37,8 @@ exception statement from your version. */
package javax.management;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
import java.io.Serializable;
/**
@@ -183,4 +185,17 @@ public class MBeanFeatureInfo
return string;
}
+ /**
+ * Serialize the {@link MBeanFeatureInfo}.
+ *
+ * @param out the output stream to write to.
+ * @throws IOException if an I/O error occurs.
+ */
+ private void writeObject(ObjectOutputStream out)
+ throws IOException
+ {
+ out.defaultWriteObject();
+ /* FIXME: Handle extra 1.6 descriptor stuff */
+ }
+
}
diff --git a/javax/management/Notification.java b/javax/management/Notification.java
index 52c11de06..2bbc206a8 100644
--- a/javax/management/Notification.java
+++ b/javax/management/Notification.java
@@ -37,6 +37,9 @@ exception statement from your version. */
package javax.management;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+
import java.util.Date;
import java.util.EventObject;
@@ -66,6 +69,11 @@ public class Notification
{
/**
+ * Compatible with JDK 1.6
+ */
+ private static final long serialVersionUID = -7516092053498031989L;
+
+ /**
* The notification message.
*
* @serial the notification message.
@@ -141,7 +149,7 @@ public class Notification
public Notification(String type, Object source, long sequenceNumber,
long timeStamp)
{
- this(type, source, sequenceNumber, timeStamp, null);
+ this(type, source, sequenceNumber, timeStamp, "");
}
/**
@@ -159,6 +167,7 @@ public class Notification
{
super(source);
this.type = type;
+ this.source = source;
this.sequenceNumber = sequenceNumber;
this.timeStamp = timeStamp;
this.message = message;
@@ -310,5 +319,17 @@ public class Notification
+ "]";
}
+ /**
+ * Serialize the {@link Notification}.
+ *
+ * @param out the output stream to write to.
+ * @throws IOException if an I/O error occurs.
+ */
+ private void writeObject(ObjectOutputStream out)
+ throws IOException
+ {
+ out.defaultWriteObject();
+ }
+
}