mx4j/src/core/javax/management/modelmbean DescriptorSupport.java,1.29,1.30

Update of /cvsroot/mx4j/mx4j/src/core/javax/management/modelmbean
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5613/src/core/javax/management/modelmbean

Modified Files:
	DescriptorSupport.java 
Log Message:
Make Serialized form the same as JDK1.5
We stick with the spec and preserve the case of field names; this may cause interop issues with V1.2.0 and V1.2.1 of the RI which allegedly (incorrectly) force the field names to lower case

Index: DescriptorSupport.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/javax/management/modelmbean/DescriptorSupport.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** DescriptorSupport.java	10 Feb 2005 19:08:08 -0000	1.29
--- DescriptorSupport.java	11 Feb 2005 22:49:52 -0000	1.30
***************
*** 36,39 ****
--- 36,40 ----
     private static final long serialVersionUID = -6292969195866300415L;
  
+    private HashMap descriptor;
     private transient HashMap fields = new HashMap(20);
  
***************
*** 597,602 ****
     private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException
     {
!       HashMap desc = (HashMap) stream.readObject();
!       this.fields = new HashMap(desc.size());
        for (Iterator i = desc.entrySet().iterator(); i.hasNext();)
        {
--- 598,603 ----
     private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException
     {
!       HashMap desc = (HashMap) stream.readFields().get("descriptor", null);
!       fields = new HashMap(desc.size());
        for (Iterator i = desc.entrySet().iterator(); i.hasNext();)
        {
***************
*** 614,618 ****
           desc.put(holder.fieldName, holder.fieldValue);
        }
!       stream.writeObject(desc);
     }
  
--- 615,621 ----
           desc.put(holder.fieldName, holder.fieldValue);
        }
!       ObjectOutputStream.PutField fields = stream.putFields();
!       fields.put("descriptor", desc);
!       stream.writeFields();
     }
  



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click