geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r578443 - /geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/marshall/Marshaller.java
Date Sat, 22 Sep 2007 14:21:16 GMT
Author: jdillon
Date: Sat Sep 22 07:21:16 2007
New Revision: 578443

URL: http://svn.apache.org/viewvc?rev=578443&view=rev
Log:
Go back to normal write/read object muck for MarshalAware bits for now

Modified:
    geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/marshall/Marshaller.java

Modified: geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/marshall/Marshaller.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/marshall/Marshaller.java?rev=578443&r1=578442&r2=578443&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/marshall/Marshaller.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-remote/gshell-remote-common/src/main/java/org/apache/geronimo/gshell/remote/marshall/Marshaller.java
Sat Sep 22 07:21:16 2007
@@ -52,13 +52,21 @@
     public static MarshalAware unmarshal(final ByteBuffer in) throws Exception {
         assert in != null;
 
+        //
+        // HACK: This is broke... so just use the default for now...
+        //
+
+        /*
         Class type = (Class) readObject(in);
 
         MarshalAware obj = (MarshalAware) type.newInstance();
 
         obj.readExternal(in);
-
+        
         return obj;
+        */
+
+        return (MarshalAware) readObject(in);
     }
 
     public MarshalAware unmarshal() throws Exception {
@@ -68,9 +76,17 @@
     public static void marshal(final ByteBuffer out, final MarshalAware obj) throws Exception
{
         assert out != null;
 
+        //
+        // HACK: This is broke... so just use the default for now...
+        //
+
+        /*
         writeObject(out, obj.getClass());
 
         obj.writeExternal(out);
+        */
+
+        writeObject(out, obj);
     }
 
     public void marshal(final MarshalAware obj) throws Exception {



Mime
View raw message