activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r563982 [11/32] - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/ main/java/org/apache/activemq/advisory/ main/java/org/apache/activemq/blob/ main/java/org/apache/activemq/broker/ main/java/org/apache/activemq/broker/jm...
Date Wed, 08 Aug 2007 18:58:13 GMT
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshaller.java Wed Aug  8 11:56:59 2007
@@ -31,38 +31,43 @@
 abstract public class BaseDataStreamMarshaller implements DataStreamMarshaller {
 
     static final public Constructor STACK_TRACE_ELEMENT_CONSTRUCTOR;
-    
+
     static {
-        Constructor constructor=null;
+        Constructor constructor = null;
         try {
-            constructor = StackTraceElement.class.getConstructor(new Class[]{String.class, String.class, String.class, int.class});            
-        } catch (Throwable e) {            
+            constructor = StackTraceElement.class.getConstructor(new Class[] {String.class, String.class,
+                                                                              String.class, int.class});
+        } catch (Throwable e) {
         }
         STACK_TRACE_ELEMENT_CONSTRUCTOR = constructor;
     }
-    
 
     abstract public byte getDataStructureType();
+
     abstract public DataStructure createObject();
-    
+
     public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
         return 0;
     }
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {        
+
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs)
+        throws IOException {
     }
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {        
+
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs)
+        throws IOException {
     }
-    
+
     public int tightMarshalLong1(OpenWireFormat wireFormat, long o, BooleanStream bs) throws IOException {
-        if( o == 0 ) {
+        if (o == 0) {
             bs.writeBoolean(false);
             bs.writeBoolean(false);
             return 0;
-        } else if ( (o & 0xFFFFFFFFFFFF0000l ) == 0 ) {
+        } else if ((o & 0xFFFFFFFFFFFF0000l) == 0) {
             bs.writeBoolean(false);
-            bs.writeBoolean(true);            
+            bs.writeBoolean(true);
             return 2;
-        } else if ( (o & 0xFFFFFFFF00000000l ) == 0) {
+        } else if ((o & 0xFFFFFFFF00000000l) == 0) {
             bs.writeBoolean(true);
             bs.writeBoolean(false);
             return 4;
@@ -72,61 +77,70 @@
             return 8;
         }
     }
-    public void tightMarshalLong2(OpenWireFormat wireFormat, long o, DataOutput dataOut, BooleanStream bs) throws IOException {
-        if( bs.readBoolean() ) {
-            if( bs.readBoolean() ) {
+
+    public void tightMarshalLong2(OpenWireFormat wireFormat, long o, DataOutput dataOut, BooleanStream bs)
+        throws IOException {
+        if (bs.readBoolean()) {
+            if (bs.readBoolean()) {
                 dataOut.writeLong(o);
             } else {
-                dataOut.writeInt((int) o);
+                dataOut.writeInt((int)o);
             }
         } else {
-            if( bs.readBoolean() ) {
-                dataOut.writeShort((int) o);
+            if (bs.readBoolean()) {
+                dataOut.writeShort((int)o);
             }
         }
     }
-    public long tightUnmarshalLong(OpenWireFormat wireFormat, DataInput dataIn, BooleanStream bs) throws IOException {
-        if( bs.readBoolean() ) {
-            if( bs.readBoolean() ) {
+
+    public long tightUnmarshalLong(OpenWireFormat wireFormat, DataInput dataIn, BooleanStream bs)
+        throws IOException {
+        if (bs.readBoolean()) {
+            if (bs.readBoolean()) {
                 return dataIn.readLong();
             } else {
                 return toLong(dataIn.readInt());
             }
         } else {
-            if( bs.readBoolean() ) {
+            if (bs.readBoolean()) {
                 return toLong(dataIn.readShort());
             } else {
                 return 0;
             }
         }
     }
-    
+
     protected long toLong(short value) {
         // lets handle negative values
         long answer = value;
         return answer & 0xffffL;
     }
-    
+
     protected long toLong(int value) {
         // lets handle negative values
         long answer = value;
         return answer & 0xffffffffL;
     }
-    
-    protected DataStructure tightUnmarsalNestedObject(OpenWireFormat wireFormat, DataInput dataIn, BooleanStream bs) throws IOException {
+
+    protected DataStructure tightUnmarsalNestedObject(OpenWireFormat wireFormat, DataInput dataIn,
+                                                      BooleanStream bs) throws IOException {
         return wireFormat.tightUnmarshalNestedObject(dataIn, bs);
-    }    
-    protected int tightMarshalNestedObject1(OpenWireFormat wireFormat, DataStructure o, BooleanStream bs) throws IOException {
+    }
+
+    protected int tightMarshalNestedObject1(OpenWireFormat wireFormat, DataStructure o, BooleanStream bs)
+        throws IOException {
         return wireFormat.tightMarshalNestedObject1(o, bs);
     }
-    
-    protected void tightMarshalNestedObject2(OpenWireFormat wireFormat, DataStructure o, DataOutput dataOut, BooleanStream bs) throws IOException {
+
+    protected void tightMarshalNestedObject2(OpenWireFormat wireFormat, DataStructure o, DataOutput dataOut,
+                                             BooleanStream bs) throws IOException {
         wireFormat.tightMarshalNestedObject2(o, dataOut, bs);
     }
 
-    protected DataStructure tightUnmarsalCachedObject(OpenWireFormat wireFormat, DataInput dataIn, BooleanStream bs) throws IOException {
-        if( wireFormat.isCacheEnabled() ) {
-            if( bs.readBoolean() ) {
+    protected DataStructure tightUnmarsalCachedObject(OpenWireFormat wireFormat, DataInput dataIn,
+                                                      BooleanStream bs) throws IOException {
+        if (wireFormat.isCacheEnabled()) {
+            if (bs.readBoolean()) {
                 short index = dataIn.readShort();
                 DataStructure object = wireFormat.tightUnmarshalNestedObject(dataIn, bs);
                 wireFormat.setInUnmarshallCache(index, object);
@@ -138,26 +152,30 @@
         } else {
             return wireFormat.tightUnmarshalNestedObject(dataIn, bs);
         }
-    }    
-    protected int tightMarshalCachedObject1(OpenWireFormat wireFormat, DataStructure o, BooleanStream bs) throws IOException {
-        if( wireFormat.isCacheEnabled() ) {
+    }
+
+    protected int tightMarshalCachedObject1(OpenWireFormat wireFormat, DataStructure o, BooleanStream bs)
+        throws IOException {
+        if (wireFormat.isCacheEnabled()) {
             Short index = wireFormat.getMarshallCacheIndex(o);
             bs.writeBoolean(index == null);
-            if( index == null ) {
+            if (index == null) {
                 int rc = wireFormat.tightMarshalNestedObject1(o, bs);
                 wireFormat.addToMarshallCache(o);
-                return 2+rc;
+                return 2 + rc;
             } else {
                 return 2;
             }
         } else {
             return wireFormat.tightMarshalNestedObject1(o, bs);
         }
-    }    
-    protected void tightMarshalCachedObject2(OpenWireFormat wireFormat, DataStructure o, DataOutput dataOut, BooleanStream bs) throws IOException {
-        if( wireFormat.isCacheEnabled() ) {
+    }
+
+    protected void tightMarshalCachedObject2(OpenWireFormat wireFormat, DataStructure o, DataOutput dataOut,
+                                             BooleanStream bs) throws IOException {
+        if (wireFormat.isCacheEnabled()) {
             Short index = wireFormat.getMarshallCacheIndex(o);
-            if( bs.readBoolean() ) {
+            if (bs.readBoolean()) {
                 dataOut.writeShort(index.shortValue());
                 wireFormat.tightMarshalNestedObject2(o, dataOut, bs);
             } else {
@@ -167,23 +185,23 @@
             wireFormat.tightMarshalNestedObject2(o, dataOut, bs);
         }
     }
-    
-    protected Throwable tightUnmarsalThrowable(OpenWireFormat wireFormat, DataInput dataIn, BooleanStream bs) throws IOException {
-        if( bs.readBoolean() ) {
-            String clazz =  tightUnmarshalString(dataIn, bs);
+
+    protected Throwable tightUnmarsalThrowable(OpenWireFormat wireFormat, DataInput dataIn, BooleanStream bs)
+        throws IOException {
+        if (bs.readBoolean()) {
+            String clazz = tightUnmarshalString(dataIn, bs);
             String message = tightUnmarshalString(dataIn, bs);
             Throwable o = createThrowable(clazz, message);
-            if( wireFormat.isStackTraceEnabled() ) {
-                if( STACK_TRACE_ELEMENT_CONSTRUCTOR!=null) {
+            if (wireFormat.isStackTraceEnabled()) {
+                if (STACK_TRACE_ELEMENT_CONSTRUCTOR != null) {
                     StackTraceElement ss[] = new StackTraceElement[dataIn.readShort()];
                     for (int i = 0; i < ss.length; i++) {
                         try {
-                            ss[i] = (StackTraceElement) STACK_TRACE_ELEMENT_CONSTRUCTOR.newInstance(new Object[]{
-                                tightUnmarshalString(dataIn, bs),
-                                tightUnmarshalString(dataIn, bs), 
-                                tightUnmarshalString(dataIn, bs), 
-                                new Integer(dataIn.readInt())
-                                });
+                            ss[i] = (StackTraceElement)STACK_TRACE_ELEMENT_CONSTRUCTOR
+                                .newInstance(new Object[] {tightUnmarshalString(dataIn, bs),
+                                                           tightUnmarshalString(dataIn, bs),
+                                                           tightUnmarshalString(dataIn, bs),
+                                                           new Integer(dataIn.readInt())});
                         } catch (IOException e) {
                             throw e;
                         } catch (Throwable e) {
@@ -194,40 +212,41 @@
                     short size = dataIn.readShort();
                     for (int i = 0; i < size; i++) {
                         tightUnmarshalString(dataIn, bs);
-                        tightUnmarshalString(dataIn, bs); 
-                        tightUnmarshalString(dataIn, bs); 
+                        tightUnmarshalString(dataIn, bs);
+                        tightUnmarshalString(dataIn, bs);
                         dataIn.readInt();
                     }
                 }
                 o.initCause(tightUnmarsalThrowable(wireFormat, dataIn, bs));
-                
+
             }
             return o;
         } else {
             return null;
         }
     }
-    
+
     private Throwable createThrowable(String className, String message) {
         try {
             Class clazz = ClassLoading.loadClass(className, BaseDataStreamMarshaller.class.getClassLoader());
-            Constructor constructor = clazz.getConstructor(new Class[]{String.class});
-            return (Throwable) constructor.newInstance(new Object[]{message});
+            Constructor constructor = clazz.getConstructor(new Class[] {String.class});
+            return (Throwable)constructor.newInstance(new Object[] {message});
         } catch (Throwable e) {
-            return new Throwable(className+": "+message);
+            return new Throwable(className + ": " + message);
         }
     }
-    
-    protected int tightMarshalThrowable1(OpenWireFormat wireFormat, Throwable o, BooleanStream bs) throws IOException { 
-        if( o==null ) {
+
+    protected int tightMarshalThrowable1(OpenWireFormat wireFormat, Throwable o, BooleanStream bs)
+        throws IOException {
+        if (o == null) {
             bs.writeBoolean(false);
             return 0;
         } else {
-            int rc=0;
+            int rc = 0;
             bs.writeBoolean(true);
             rc += tightMarshalString1(o.getClass().getName(), bs);
             rc += tightMarshalString1(o.getMessage(), bs);
-            if( wireFormat.isStackTraceEnabled() ) {
+            if (wireFormat.isStackTraceEnabled()) {
                 rc += 2;
                 StackTraceElement[] stackTrace = o.getStackTrace();
                 for (int i = 0; i < stackTrace.length; i++) {
@@ -242,12 +261,13 @@
             return rc;
         }
     }
-    
-    protected void tightMarshalThrowable2(OpenWireFormat wireFormat, Throwable o, DataOutput dataOut, BooleanStream bs) throws IOException {
-        if( bs.readBoolean() ) {
+
+    protected void tightMarshalThrowable2(OpenWireFormat wireFormat, Throwable o, DataOutput dataOut,
+                                          BooleanStream bs) throws IOException {
+        if (bs.readBoolean()) {
             tightMarshalString2(o.getClass().getName(), dataOut, bs);
             tightMarshalString2(o.getMessage(), dataOut, bs);
-            if( wireFormat.isStackTraceEnabled() ) {
+            if (wireFormat.isStackTraceEnabled()) {
                 StackTraceElement[] stackTrace = o.getStackTrace();
                 dataOut.writeShort(stackTrace.length);
                 for (int i = 0; i < stackTrace.length; i++) {
@@ -261,31 +281,32 @@
             }
         }
     }
-    
+
     protected String tightUnmarshalString(DataInput dataIn, BooleanStream bs) throws IOException {
-        if( bs.readBoolean() ) {
-            if( bs.readBoolean() ) {
+        if (bs.readBoolean()) {
+            if (bs.readBoolean()) {
                 int size = dataIn.readShort();
                 byte data[] = new byte[size];
                 dataIn.readFully(data);
-                return new String(data,0); // Yes deprecated, but we know what we are doing.
-            }  else {
+                return new String(data, 0); // Yes deprecated, but we know what
+                                            // we are doing.
+            } else {
                 return dataIn.readUTF();
             }
         } else {
             return null;
         }
     }
-    
-    protected int tightMarshalString1(String value, BooleanStream bs) throws IOException { 
-        bs.writeBoolean(value!=null);
-        if( value!=null ) {
-            
+
+    protected int tightMarshalString1(String value, BooleanStream bs) throws IOException {
+        bs.writeBoolean(value != null);
+        if (value != null) {
+
             int strlen = value.length();
             int utflen = 0;
             char[] charr = new char[strlen];
             int c, count = 0;
-            boolean isOnlyAscii=true;
+            boolean isOnlyAscii = true;
 
             value.getChars(0, strlen, charr, 0);
 
@@ -295,43 +316,44 @@
                     utflen++;
                 } else if (c > 0x07FF) {
                     utflen += 3;
-                    isOnlyAscii=false;
+                    isOnlyAscii = false;
                 } else {
-                    isOnlyAscii=false;
+                    isOnlyAscii = false;
                     utflen += 2;
                 }
             }
-            
-            if( utflen >= Short.MAX_VALUE )
+
+            if (utflen >= Short.MAX_VALUE) {
                 throw new IOException("Encountered a String value that is too long to encode.");
-            
-            bs.writeBoolean(isOnlyAscii);            
-            return utflen+2;
-            
+            }
+            bs.writeBoolean(isOnlyAscii);
+            return utflen + 2;
+
         } else {
             return 0;
         }
     }
-    
+
     protected void tightMarshalString2(String value, DataOutput dataOut, BooleanStream bs) throws IOException {
-        if( bs.readBoolean() ) {
+        if (bs.readBoolean()) {
             // If we verified it only holds ascii values
-            if( bs.readBoolean() ) {
+            if (bs.readBoolean()) {
                 dataOut.writeShort(value.length());
                 dataOut.writeBytes(value);
             } else {
-                dataOut.writeUTF(value);                
+                dataOut.writeUTF(value);
             }
         }
-    }  
-    
-    protected int tightMarshalObjectArray1(OpenWireFormat wireFormat, DataStructure[] objects, BooleanStream bs) throws IOException {
-        if( objects != null ) {
-            int rc=0;
+    }
+
+    protected int tightMarshalObjectArray1(OpenWireFormat wireFormat, DataStructure[] objects,
+                                           BooleanStream bs) throws IOException {
+        if (objects != null) {
+            int rc = 0;
             bs.writeBoolean(true);
             rc += 2;
-            for( int i=0; i < objects.length; i++ ) {
-                rc += tightMarshalNestedObject1(wireFormat,objects[i], bs);
+            for (int i = 0; i < objects.length; i++) {
+                rc += tightMarshalNestedObject1(wireFormat, objects[i], bs);
             }
             return rc;
         } else {
@@ -339,12 +361,13 @@
             return 0;
         }
     }
-    
-    protected void tightMarshalObjectArray2(OpenWireFormat wireFormat, DataStructure[] objects, DataOutput dataOut, BooleanStream bs) throws IOException {
-        if( bs.readBoolean() ) {
+
+    protected void tightMarshalObjectArray2(OpenWireFormat wireFormat, DataStructure[] objects,
+                                            DataOutput dataOut, BooleanStream bs) throws IOException {
+        if (bs.readBoolean()) {
             dataOut.writeShort(objects.length);
-            for( int i=0; i < objects.length; i++ ) {
-                tightMarshalNestedObject2(wireFormat,objects[i], dataOut, bs);
+            for (int i = 0; i < objects.length; i++) {
+                tightMarshalNestedObject2(wireFormat, objects[i], dataOut, bs);
             }
         }
     }
@@ -352,61 +375,66 @@
     protected int tightMarshalConstByteArray1(byte[] data, BooleanStream bs, int i) throws IOException {
         return i;
     }
-    protected void tightMarshalConstByteArray2(byte[] data, DataOutput dataOut, BooleanStream bs, int i) throws IOException {
+
+    protected void tightMarshalConstByteArray2(byte[] data, DataOutput dataOut, BooleanStream bs, int i)
+        throws IOException {
         dataOut.write(data, 0, i);
     }
 
-    protected byte[] tightUnmarshalConstByteArray(DataInput dataIn, BooleanStream bs, int i) throws IOException {
+    protected byte[] tightUnmarshalConstByteArray(DataInput dataIn, BooleanStream bs, int i)
+        throws IOException {
         byte data[] = new byte[i];
         dataIn.readFully(data);
         return data;
     }
 
     protected int tightMarshalByteArray1(byte[] data, BooleanStream bs) throws IOException {
-        bs.writeBoolean(data!=null);
-        if( data!=null ){
-            return data.length+4;
+        bs.writeBoolean(data != null);
+        if (data != null) {
+            return data.length + 4;
         } else {
             return 0;
         }
     }
-    
-    protected void tightMarshalByteArray2(byte[] data, DataOutput dataOut, BooleanStream bs) throws IOException {
-        if( bs.readBoolean() ){
+
+    protected void tightMarshalByteArray2(byte[] data, DataOutput dataOut, BooleanStream bs)
+        throws IOException {
+        if (bs.readBoolean()) {
             dataOut.writeInt(data.length);
             dataOut.write(data);
         }
     }
 
     protected byte[] tightUnmarshalByteArray(DataInput dataIn, BooleanStream bs) throws IOException {
-        byte rc[]=null;
-        if( bs.readBoolean() ) {
+        byte rc[] = null;
+        if (bs.readBoolean()) {
             int size = dataIn.readInt();
             rc = new byte[size];
             dataIn.readFully(rc);
         }
         return rc;
     }
-    
+
     protected int tightMarshalByteSequence1(ByteSequence data, BooleanStream bs) throws IOException {
-        bs.writeBoolean(data!=null);
-        if( data!=null ){
-            return data.getLength()+4;
+        bs.writeBoolean(data != null);
+        if (data != null) {
+            return data.getLength() + 4;
         } else {
             return 0;
         }
     }
-    
-    protected void tightMarshalByteSequence2(ByteSequence data, DataOutput dataOut, BooleanStream bs) throws IOException {
-        if( bs.readBoolean() ){
+
+    protected void tightMarshalByteSequence2(ByteSequence data, DataOutput dataOut, BooleanStream bs)
+        throws IOException {
+        if (bs.readBoolean()) {
             dataOut.writeInt(data.getLength());
             dataOut.write(data.getData(), data.getOffset(), data.getLength());
         }
     }
 
     protected ByteSequence tightUnmarshalByteSequence(DataInput dataIn, BooleanStream bs) throws IOException {
-        ByteSequence rc=null;
-        if( bs.readBoolean() ) {
+        ByteSequence rc = null;
+        if (bs.readBoolean()) {
             int size = dataIn.readInt();
             byte[] t = new byte[size];
             dataIn.readFully(t);
@@ -418,29 +446,35 @@
     //
     // The loose marshaling logic
     //
-    
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {        
+
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
     }
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {        
+
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
     }
-    
+
     public void looseMarshalLong(OpenWireFormat wireFormat, long o, DataOutput dataOut) throws IOException {
         dataOut.writeLong(o);
     }
+
     public long looseUnmarshalLong(OpenWireFormat wireFormat, DataInput dataIn) throws IOException {
         return dataIn.readLong();
     }
-    
-    protected DataStructure looseUnmarsalNestedObject(OpenWireFormat wireFormat, DataInput dataIn) throws IOException {
+
+    protected DataStructure looseUnmarsalNestedObject(OpenWireFormat wireFormat, DataInput dataIn)
+        throws IOException {
         return wireFormat.looseUnmarshalNestedObject(dataIn);
-    }    
-    protected void looseMarshalNestedObject(OpenWireFormat wireFormat, DataStructure o, DataOutput dataOut) throws IOException {
+    }
+
+    protected void looseMarshalNestedObject(OpenWireFormat wireFormat, DataStructure o, DataOutput dataOut)
+        throws IOException {
         wireFormat.looseMarshalNestedObject(o, dataOut);
     }
 
-    protected DataStructure looseUnmarsalCachedObject(OpenWireFormat wireFormat, DataInput dataIn) throws IOException {
-        if( wireFormat.isCacheEnabled() ) {
-            if( dataIn.readBoolean() ) {
+    protected DataStructure looseUnmarsalCachedObject(OpenWireFormat wireFormat, DataInput dataIn)
+        throws IOException {
+        if (wireFormat.isCacheEnabled()) {
+            if (dataIn.readBoolean()) {
                 short index = dataIn.readShort();
                 DataStructure object = wireFormat.looseUnmarshalNestedObject(dataIn);
                 wireFormat.setInUnmarshallCache(index, object);
@@ -452,12 +486,14 @@
         } else {
             return wireFormat.looseUnmarshalNestedObject(dataIn);
         }
-    }    
-    protected void looseMarshalCachedObject(OpenWireFormat wireFormat, DataStructure o, DataOutput dataOut) throws IOException {
-        if( wireFormat.isCacheEnabled() ) {
+    }
+
+    protected void looseMarshalCachedObject(OpenWireFormat wireFormat, DataStructure o, DataOutput dataOut)
+        throws IOException {
+        if (wireFormat.isCacheEnabled()) {
             Short index = wireFormat.getMarshallCacheIndex(o);
             dataOut.writeBoolean(index == null);
-            if( index == null ) {
+            if (index == null) {
                 index = wireFormat.addToMarshallCache(o);
                 dataOut.writeShort(index.shortValue());
                 wireFormat.looseMarshalNestedObject(o, dataOut);
@@ -468,23 +504,23 @@
             wireFormat.looseMarshalNestedObject(o, dataOut);
         }
     }
-    
-    protected Throwable looseUnmarsalThrowable(OpenWireFormat wireFormat, DataInput dataIn) throws IOException {
-        if( dataIn.readBoolean() ) {
-            String clazz =  looseUnmarshalString(dataIn);
+
+    protected Throwable looseUnmarsalThrowable(OpenWireFormat wireFormat, DataInput dataIn)
+        throws IOException {
+        if (dataIn.readBoolean()) {
+            String clazz = looseUnmarshalString(dataIn);
             String message = looseUnmarshalString(dataIn);
             Throwable o = createThrowable(clazz, message);
-            if( wireFormat.isStackTraceEnabled() ) {
-                if( STACK_TRACE_ELEMENT_CONSTRUCTOR!=null) {
+            if (wireFormat.isStackTraceEnabled()) {
+                if (STACK_TRACE_ELEMENT_CONSTRUCTOR != null) {
                     StackTraceElement ss[] = new StackTraceElement[dataIn.readShort()];
                     for (int i = 0; i < ss.length; i++) {
                         try {
-                            ss[i] = (StackTraceElement) STACK_TRACE_ELEMENT_CONSTRUCTOR.newInstance(new Object[]{
-                                looseUnmarshalString(dataIn),
-                                looseUnmarshalString(dataIn), 
-                                looseUnmarshalString(dataIn), 
-                                new Integer(dataIn.readInt())
-                                });
+                            ss[i] = (StackTraceElement)STACK_TRACE_ELEMENT_CONSTRUCTOR
+                                .newInstance(new Object[] {looseUnmarshalString(dataIn),
+                                                           looseUnmarshalString(dataIn),
+                                                           looseUnmarshalString(dataIn),
+                                                           new Integer(dataIn.readInt())});
                         } catch (IOException e) {
                             throw e;
                         } catch (Throwable e) {
@@ -495,27 +531,27 @@
                     short size = dataIn.readShort();
                     for (int i = 0; i < size; i++) {
                         looseUnmarshalString(dataIn);
-                        looseUnmarshalString(dataIn); 
-                        looseUnmarshalString(dataIn); 
+                        looseUnmarshalString(dataIn);
+                        looseUnmarshalString(dataIn);
                         dataIn.readInt();
                     }
                 }
                 o.initCause(looseUnmarsalThrowable(wireFormat, dataIn));
-                
+
             }
             return o;
         } else {
             return null;
         }
     }
-        
-    
-    protected void looseMarshalThrowable(OpenWireFormat wireFormat, Throwable o, DataOutput dataOut) throws IOException {
-        dataOut.writeBoolean(o!=null);
-        if( o!=null ) {
+
+    protected void looseMarshalThrowable(OpenWireFormat wireFormat, Throwable o, DataOutput dataOut)
+        throws IOException {
+        dataOut.writeBoolean(o != null);
+        if (o != null) {
             looseMarshalString(o.getClass().getName(), dataOut);
             looseMarshalString(o.getMessage(), dataOut);
-            if( wireFormat.isStackTraceEnabled() ) {
+            if (wireFormat.isStackTraceEnabled()) {
                 StackTraceElement[] stackTrace = o.getStackTrace();
                 dataOut.writeShort(stackTrace.length);
                 for (int i = 0; i < stackTrace.length; i++) {
@@ -529,33 +565,35 @@
             }
         }
     }
-    
+
     protected String looseUnmarshalString(DataInput dataIn) throws IOException {
-        if( dataIn.readBoolean() ) {
+        if (dataIn.readBoolean()) {
             return dataIn.readUTF();
         } else {
             return null;
         }
     }
-    
+
     protected void looseMarshalString(String value, DataOutput dataOut) throws IOException {
-        dataOut.writeBoolean(value!=null);
-        if( value!=null ) {
-            dataOut.writeUTF(value);                
-        }
-    }  
-    
-    protected void looseMarshalObjectArray(OpenWireFormat wireFormat, DataStructure[] objects, DataOutput dataOut) throws IOException {
-        dataOut.writeBoolean(objects!=null);
-        if( objects!=null ) {
+        dataOut.writeBoolean(value != null);
+        if (value != null) {
+            dataOut.writeUTF(value);
+        }
+    }
+
+    protected void looseMarshalObjectArray(OpenWireFormat wireFormat, DataStructure[] objects,
+                                           DataOutput dataOut) throws IOException {
+        dataOut.writeBoolean(objects != null);
+        if (objects != null) {
             dataOut.writeShort(objects.length);
-            for( int i=0; i < objects.length; i++ ) {
-                looseMarshalNestedObject(wireFormat,objects[i], dataOut);
+            for (int i = 0; i < objects.length; i++) {
+                looseMarshalNestedObject(wireFormat, objects[i], dataOut);
             }
         }
     }
-    
-    protected void looseMarshalConstByteArray(OpenWireFormat wireFormat, byte[] data, DataOutput dataOut, int i) throws IOException {
+
+    protected void looseMarshalConstByteArray(OpenWireFormat wireFormat, byte[] data, DataOutput dataOut,
+                                              int i) throws IOException {
         dataOut.write(data, 0, i);
     }
 
@@ -565,17 +603,18 @@
         return data;
     }
 
-    protected void looseMarshalByteArray(OpenWireFormat wireFormat, byte[] data, DataOutput dataOut) throws IOException {
-        dataOut.writeBoolean(data!=null);
-        if( data!=null ){
+    protected void looseMarshalByteArray(OpenWireFormat wireFormat, byte[] data, DataOutput dataOut)
+        throws IOException {
+        dataOut.writeBoolean(data != null);
+        if (data != null) {
             dataOut.writeInt(data.length);
             dataOut.write(data);
         }
     }
 
     protected byte[] looseUnmarshalByteArray(DataInput dataIn) throws IOException {
-        byte rc[]=null;
-        if( dataIn.readBoolean() ) {
+        byte rc[] = null;
+        if (dataIn.readBoolean()) {
             int size = dataIn.readInt();
             rc = new byte[size];
             dataIn.readFully(rc);
@@ -583,17 +622,18 @@
         return rc;
     }
 
-    protected void looseMarshalByteSequence(OpenWireFormat wireFormat, ByteSequence data, DataOutput dataOut) throws IOException {
-        dataOut.writeBoolean(data!=null);
-        if( data!=null ){
+    protected void looseMarshalByteSequence(OpenWireFormat wireFormat, ByteSequence data, DataOutput dataOut)
+        throws IOException {
+        dataOut.writeBoolean(data != null);
+        if (data != null) {
             dataOut.writeInt(data.getLength());
             dataOut.write(data.getData(), data.getOffset(), data.getLength());
         }
     }
 
     protected ByteSequence looseUnmarshalByteSequence(DataInput dataIn) throws IOException {
-        ByteSequence rc=null;
-        if( dataIn.readBoolean() ) {
+        ByteSequence rc = null;
+        if (dataIn.readBoolean()) {
             int size = dataIn.readInt();
             byte[] t = new byte[size];
             dataIn.readFully(t);

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java Wed Aug  8 11:56:59 2007
@@ -24,29 +24,27 @@
 import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
-
-
 /**
  * Marshalling code for Open Wire Format for ConnectionInfoMarshaller
- *
- *
- * NOTE!: This file is auto generated - do not modify!
- *        if you need to make a change, please see the modify the groovy scripts in the
- *        under src/gram/script and then use maven openwire:generate to regenerate 
- *        this file.
- *
+ * 
+ * 
+ * NOTE!: This file is auto generated - do not modify! if you need to make a
+ * change, please see the modify the groovy scripts in the under src/gram/script
+ * and then use maven openwire:generate to regenerate this file.
+ * 
  * @version $Revision$
  */
 public class ConnectionInfoMarshaller extends BaseCommandMarshaller {
 
     /**
      * Return the type of Data Structure we marshal
+     * 
      * @return short representation of the type data structure
      */
     public byte getDataStructureType() {
         return ConnectionInfo.DATA_STRUCTURE_TYPE;
     }
-    
+
     /**
      * @return a new object instance
      */
@@ -56,16 +54,18 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs)
+        throws IOException {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         ConnectionInfo info = (ConnectionInfo)o;
-        info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId)tightUnmarsalCachedObject(wireFormat,
+                                                                                                 dataIn, bs));
         info.setClientId(tightUnmarshalString(dataIn, bs));
         info.setPassword(tightUnmarshalString(dataIn, bs));
         info.setUserName(tightUnmarshalString(dataIn, bs));
@@ -73,12 +73,12 @@
         if (bs.readBoolean()) {
             short size = dataIn.readShort();
             org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
-            for( int i=0; i < size; i++ ) {
-                value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
+            for (int i = 0; i < size; i++) {
+                value[i] = (org.apache.activemq.command.BrokerId)tightUnmarsalNestedObject(wireFormat,
+                                                                                           dataIn, bs);
             }
             info.setBrokerPath(value);
-        }
-        else {
+        } else {
             info.setBrokerPath(null);
         }
         info.setBrokerMasterConnector(bs.readBoolean());
@@ -86,7 +86,6 @@
 
     }
 
-
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
@@ -108,12 +107,13 @@
 
     /**
      * Write a object instance to data output stream
-     *
+     * 
      * @param o the instance to be marshaled
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
      */
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs)
+        throws IOException {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         ConnectionInfo info = (ConnectionInfo)o;
@@ -129,7 +129,7 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
@@ -138,7 +138,8 @@
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         ConnectionInfo info = (ConnectionInfo)o;
-        info.setConnectionId((org.apache.activemq.command.ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId)looseUnmarsalCachedObject(wireFormat,
+                                                                                                 dataIn));
         info.setClientId(looseUnmarshalString(dataIn));
         info.setPassword(looseUnmarshalString(dataIn));
         info.setUserName(looseUnmarshalString(dataIn));
@@ -146,19 +147,17 @@
         if (dataIn.readBoolean()) {
             short size = dataIn.readShort();
             org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
-            for( int i=0; i < size; i++ ) {
-                value[i] = (org.apache.activemq.command.BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
+            for (int i = 0; i < size; i++) {
+                value[i] = (org.apache.activemq.command.BrokerId)looseUnmarsalNestedObject(wireFormat, dataIn);
             }
             info.setBrokerPath(value);
-        }
-        else {
+        } else {
             info.setBrokerPath(null);
         }
         info.setBrokerMasterConnector(dataIn.readBoolean());
         info.setManageable(dataIn.readBoolean());
 
     }
-
 
     /**
      * Write the booleans that this object uses to a BooleanStream

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java Wed Aug  8 11:56:59 2007
@@ -24,29 +24,27 @@
 import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
-
-
 /**
  * Marshalling code for Open Wire Format for ConsumerIdMarshaller
- *
- *
- * NOTE!: This file is auto generated - do not modify!
- *        if you need to make a change, please see the modify the groovy scripts in the
- *        under src/gram/script and then use maven openwire:generate to regenerate 
- *        this file.
- *
+ * 
+ * 
+ * NOTE!: This file is auto generated - do not modify! if you need to make a
+ * change, please see the modify the groovy scripts in the under src/gram/script
+ * and then use maven openwire:generate to regenerate this file.
+ * 
  * @version $Revision$
  */
 public class ConsumerIdMarshaller extends BaseDataStreamMarshaller {
 
     /**
      * Return the type of Data Structure we marshal
+     * 
      * @return short representation of the type data structure
      */
     public byte getDataStructureType() {
         return ConsumerId.DATA_STRUCTURE_TYPE;
     }
-    
+
     /**
      * @return a new object instance
      */
@@ -56,12 +54,13 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs)
+        throws IOException {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         ConsumerId info = (ConsumerId)o;
@@ -71,7 +70,6 @@
 
     }
 
-
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
@@ -81,20 +79,21 @@
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
         rc += tightMarshalString1(info.getConnectionId(), bs);
-        rc+=tightMarshalLong1(wireFormat, info.getSessionId(), bs);
-        rc+=tightMarshalLong1(wireFormat, info.getValue(), bs);
+        rc += tightMarshalLong1(wireFormat, info.getSessionId(), bs);
+        rc += tightMarshalLong1(wireFormat, info.getValue(), bs);
 
         return rc + 0;
     }
 
     /**
      * Write a object instance to data output stream
-     *
+     * 
      * @param o the instance to be marshaled
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
      */
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs)
+        throws IOException {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         ConsumerId info = (ConsumerId)o;
@@ -106,7 +105,7 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
@@ -120,7 +119,6 @@
         info.setValue(looseUnmarshalLong(wireFormat, dataIn));
 
     }
-
 
     /**
      * Write the booleans that this object uses to a BooleanStream

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java Wed Aug  8 11:56:59 2007
@@ -24,29 +24,27 @@
 import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
-
-
 /**
  * Marshalling code for Open Wire Format for ConsumerInfoMarshaller
- *
- *
- * NOTE!: This file is auto generated - do not modify!
- *        if you need to make a change, please see the modify the groovy scripts in the
- *        under src/gram/script and then use maven openwire:generate to regenerate 
- *        this file.
- *
+ * 
+ * 
+ * NOTE!: This file is auto generated - do not modify! if you need to make a
+ * change, please see the modify the groovy scripts in the under src/gram/script
+ * and then use maven openwire:generate to regenerate this file.
+ * 
  * @version $Revision$
  */
 public class ConsumerInfoMarshaller extends BaseCommandMarshaller {
 
     /**
      * Return the type of Data Structure we marshal
+     * 
      * @return short representation of the type data structure
      */
     public byte getDataStructureType() {
         return ConsumerInfo.DATA_STRUCTURE_TYPE;
     }
-    
+
     /**
      * @return a new object instance
      */
@@ -56,18 +54,24 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs)
+        throws IOException {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         ConsumerInfo info = (ConsumerInfo)o;
-        info.setConsumerId((org.apache.activemq.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConsumerId((org.apache.activemq.command.ConsumerId)tightUnmarsalCachedObject(wireFormat,
+                                                                                             dataIn, bs));
         info.setBrowser(bs.readBoolean());
-        info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info
+            .setDestination((org.apache.activemq.command.ActiveMQDestination)tightUnmarsalCachedObject(
+                                                                                                       wireFormat,
+                                                                                                       dataIn,
+                                                                                                       bs));
         info.setPrefetchSize(dataIn.readInt());
         info.setMaximumPendingMessageLimit(dataIn.readInt());
         info.setDispatchAsync(bs.readBoolean());
@@ -81,22 +85,25 @@
         if (bs.readBoolean()) {
             short size = dataIn.readShort();
             org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
-            for( int i=0; i < size; i++ ) {
-                value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
+            for (int i = 0; i < size; i++) {
+                value[i] = (org.apache.activemq.command.BrokerId)tightUnmarsalNestedObject(wireFormat,
+                                                                                           dataIn, bs);
             }
             info.setBrokerPath(value);
-        }
-        else {
+        } else {
             info.setBrokerPath(null);
         }
-        info.setAdditionalPredicate((org.apache.activemq.filter.BooleanExpression) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info
+            .setAdditionalPredicate((org.apache.activemq.filter.BooleanExpression)tightUnmarsalNestedObject(
+                                                                                                            wireFormat,
+                                                                                                            dataIn,
+                                                                                                            bs));
         info.setNetworkSubscription(bs.readBoolean());
         info.setOptimizedAcknowledge(bs.readBoolean());
         info.setNoRangeAcks(bs.readBoolean());
 
     }
 
-
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
@@ -125,12 +132,13 @@
 
     /**
      * Write a object instance to data output stream
-     *
+     * 
      * @param o the instance to be marshaled
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
      */
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs)
+        throws IOException {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         ConsumerInfo info = (ConsumerInfo)o;
@@ -156,7 +164,7 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
@@ -165,9 +173,13 @@
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         ConsumerInfo info = (ConsumerInfo)o;
-        info.setConsumerId((org.apache.activemq.command.ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setConsumerId((org.apache.activemq.command.ConsumerId)looseUnmarsalCachedObject(wireFormat,
+                                                                                             dataIn));
         info.setBrowser(dataIn.readBoolean());
-        info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info
+            .setDestination((org.apache.activemq.command.ActiveMQDestination)looseUnmarsalCachedObject(
+                                                                                                       wireFormat,
+                                                                                                       dataIn));
         info.setPrefetchSize(dataIn.readInt());
         info.setMaximumPendingMessageLimit(dataIn.readInt());
         info.setDispatchAsync(dataIn.readBoolean());
@@ -181,21 +193,22 @@
         if (dataIn.readBoolean()) {
             short size = dataIn.readShort();
             org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
-            for( int i=0; i < size; i++ ) {
-                value[i] = (org.apache.activemq.command.BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
+            for (int i = 0; i < size; i++) {
+                value[i] = (org.apache.activemq.command.BrokerId)looseUnmarsalNestedObject(wireFormat, dataIn);
             }
             info.setBrokerPath(value);
-        }
-        else {
+        } else {
             info.setBrokerPath(null);
         }
-        info.setAdditionalPredicate((org.apache.activemq.filter.BooleanExpression) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info
+            .setAdditionalPredicate((org.apache.activemq.filter.BooleanExpression)looseUnmarsalNestedObject(
+                                                                                                            wireFormat,
+                                                                                                            dataIn));
         info.setNetworkSubscription(dataIn.readBoolean());
         info.setOptimizedAcknowledge(dataIn.readBoolean());
         info.setNoRangeAcks(dataIn.readBoolean());
 
     }
-
 
     /**
      * Write the booleans that this object uses to a BooleanStream

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java Wed Aug  8 11:56:59 2007
@@ -24,29 +24,27 @@
 import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
-
-
 /**
  * Marshalling code for Open Wire Format for DataArrayResponseMarshaller
- *
- *
- * NOTE!: This file is auto generated - do not modify!
- *        if you need to make a change, please see the modify the groovy scripts in the
- *        under src/gram/script and then use maven openwire:generate to regenerate 
- *        this file.
- *
+ * 
+ * 
+ * NOTE!: This file is auto generated - do not modify! if you need to make a
+ * change, please see the modify the groovy scripts in the under src/gram/script
+ * and then use maven openwire:generate to regenerate this file.
+ * 
  * @version $Revision$
  */
 public class DataArrayResponseMarshaller extends ResponseMarshaller {
 
     /**
      * Return the type of Data Structure we marshal
+     * 
      * @return short representation of the type data structure
      */
     public byte getDataStructureType() {
         return DataArrayResponse.DATA_STRUCTURE_TYPE;
     }
-    
+
     /**
      * @return a new object instance
      */
@@ -56,12 +54,13 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs)
+        throws IOException {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         DataArrayResponse info = (DataArrayResponse)o;
@@ -69,18 +68,17 @@
         if (bs.readBoolean()) {
             short size = dataIn.readShort();
             org.apache.activemq.command.DataStructure value[] = new org.apache.activemq.command.DataStructure[size];
-            for( int i=0; i < size; i++ ) {
-                value[i] = (org.apache.activemq.command.DataStructure) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
+            for (int i = 0; i < size; i++) {
+                value[i] = (org.apache.activemq.command.DataStructure)tightUnmarsalNestedObject(wireFormat,
+                                                                                                dataIn, bs);
             }
             info.setData(value);
-        }
-        else {
+        } else {
             info.setData(null);
         }
 
     }
 
-
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
@@ -96,12 +94,13 @@
 
     /**
      * Write a object instance to data output stream
-     *
+     * 
      * @param o the instance to be marshaled
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
      */
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs)
+        throws IOException {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         DataArrayResponse info = (DataArrayResponse)o;
@@ -111,7 +110,7 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
@@ -124,17 +123,16 @@
         if (dataIn.readBoolean()) {
             short size = dataIn.readShort();
             org.apache.activemq.command.DataStructure value[] = new org.apache.activemq.command.DataStructure[size];
-            for( int i=0; i < size; i++ ) {
-                value[i] = (org.apache.activemq.command.DataStructure) looseUnmarsalNestedObject(wireFormat,dataIn);
+            for (int i = 0; i < size; i++) {
+                value[i] = (org.apache.activemq.command.DataStructure)looseUnmarsalNestedObject(wireFormat,
+                                                                                                dataIn);
             }
             info.setData(value);
-        }
-        else {
+        } else {
             info.setData(null);
         }
 
     }
-
 
     /**
      * Write the booleans that this object uses to a BooleanStream

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java Wed Aug  8 11:56:59 2007
@@ -24,29 +24,27 @@
 import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
-
-
 /**
  * Marshalling code for Open Wire Format for DestinationInfoMarshaller
- *
- *
- * NOTE!: This file is auto generated - do not modify!
- *        if you need to make a change, please see the modify the groovy scripts in the
- *        under src/gram/script and then use maven openwire:generate to regenerate 
- *        this file.
- *
+ * 
+ * 
+ * NOTE!: This file is auto generated - do not modify! if you need to make a
+ * change, please see the modify the groovy scripts in the under src/gram/script
+ * and then use maven openwire:generate to regenerate this file.
+ * 
  * @version $Revision$
  */
 public class DestinationInfoMarshaller extends BaseCommandMarshaller {
 
     /**
      * Return the type of Data Structure we marshal
+     * 
      * @return short representation of the type data structure
      */
     public byte getDataStructureType() {
         return DestinationInfo.DATA_STRUCTURE_TYPE;
     }
-    
+
     /**
      * @return a new object instance
      */
@@ -56,35 +54,40 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs)
+        throws IOException {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         DestinationInfo info = (DestinationInfo)o;
-        info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId)tightUnmarsalCachedObject(wireFormat,
+                                                                                                 dataIn, bs));
+        info
+            .setDestination((org.apache.activemq.command.ActiveMQDestination)tightUnmarsalCachedObject(
+                                                                                                       wireFormat,
+                                                                                                       dataIn,
+                                                                                                       bs));
         info.setOperationType(dataIn.readByte());
         info.setTimeout(tightUnmarshalLong(wireFormat, dataIn, bs));
 
         if (bs.readBoolean()) {
             short size = dataIn.readShort();
             org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
-            for( int i=0; i < size; i++ ) {
-                value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
+            for (int i = 0; i < size; i++) {
+                value[i] = (org.apache.activemq.command.BrokerId)tightUnmarsalNestedObject(wireFormat,
+                                                                                           dataIn, bs);
             }
             info.setBrokerPath(value);
-        }
-        else {
+        } else {
             info.setBrokerPath(null);
         }
 
     }
 
-
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
@@ -95,7 +98,7 @@
         int rc = super.tightMarshal1(wireFormat, o, bs);
         rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs);
         rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
-        rc+=tightMarshalLong1(wireFormat, info.getTimeout(), bs);
+        rc += tightMarshalLong1(wireFormat, info.getTimeout(), bs);
         rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs);
 
         return rc + 1;
@@ -103,12 +106,13 @@
 
     /**
      * Write a object instance to data output stream
-     *
+     * 
      * @param o the instance to be marshaled
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
      */
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs)
+        throws IOException {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         DestinationInfo info = (DestinationInfo)o;
@@ -122,7 +126,7 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
@@ -131,25 +135,27 @@
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         DestinationInfo info = (DestinationInfo)o;
-        info.setConnectionId((org.apache.activemq.command.ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId)looseUnmarsalCachedObject(wireFormat,
+                                                                                                 dataIn));
+        info
+            .setDestination((org.apache.activemq.command.ActiveMQDestination)looseUnmarsalCachedObject(
+                                                                                                       wireFormat,
+                                                                                                       dataIn));
         info.setOperationType(dataIn.readByte());
         info.setTimeout(looseUnmarshalLong(wireFormat, dataIn));
 
         if (dataIn.readBoolean()) {
             short size = dataIn.readShort();
             org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
-            for( int i=0; i < size; i++ ) {
-                value[i] = (org.apache.activemq.command.BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
+            for (int i = 0; i < size; i++) {
+                value[i] = (org.apache.activemq.command.BrokerId)looseUnmarsalNestedObject(wireFormat, dataIn);
             }
             info.setBrokerPath(value);
-        }
-        else {
+        } else {
             info.setBrokerPath(null);
         }
 
     }
-
 
     /**
      * Write the booleans that this object uses to a BooleanStream

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java Wed Aug  8 11:56:59 2007
@@ -21,14 +21,11 @@
 import org.apache.activemq.openwire.OpenWireFormat;
 
 /**
- * MarshallerFactory for Open Wire Format.
- *
- *
- * NOTE!: This file is auto generated - do not modify!
- *        if you need to make a change, please see the modify the groovy scripts in the
- *        under src/gram/script and then use maven openwire:generate to regenerate 
- *        this file.
- *
+ * MarshallerFactory for Open Wire Format. NOTE!: This file is auto generated -
+ * do not modify! if you need to make a change, please see the modify the groovy
+ * scripts in the under src/gram/script and then use maven openwire:generate to
+ * regenerate this file.
+ * 
  * @version $Revision$
  */
 public class MarshallerFactory {
@@ -93,12 +90,12 @@
         add(new RemoveInfoMarshaller());
         add(new ExceptionResponseMarshaller());
 
-	}
+    }
 
-	static private void add(DataStreamMarshaller dsm) {
+    static private void add(DataStreamMarshaller dsm) {
         marshaller[dsm.getDataStructureType()] = dsm;
     }
-	
+
     static public DataStreamMarshaller[] createMarshallerMap(OpenWireFormat wireFormat) {
         return marshaller;
     }

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java Wed Aug  8 11:56:59 2007
@@ -24,29 +24,27 @@
 import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
-
-
 /**
  * Marshalling code for Open Wire Format for MessageIdMarshaller
- *
- *
- * NOTE!: This file is auto generated - do not modify!
- *        if you need to make a change, please see the modify the groovy scripts in the
- *        under src/gram/script and then use maven openwire:generate to regenerate 
- *        this file.
- *
+ * 
+ * 
+ * NOTE!: This file is auto generated - do not modify! if you need to make a
+ * change, please see the modify the groovy scripts in the under src/gram/script
+ * and then use maven openwire:generate to regenerate this file.
+ * 
  * @version $Revision$
  */
 public class MessageIdMarshaller extends BaseDataStreamMarshaller {
 
     /**
      * Return the type of Data Structure we marshal
+     * 
      * @return short representation of the type data structure
      */
     public byte getDataStructureType() {
         return MessageId.DATA_STRUCTURE_TYPE;
     }
-    
+
     /**
      * @return a new object instance
      */
@@ -56,22 +54,23 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs)
+        throws IOException {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         MessageId info = (MessageId)o;
-        info.setProducerId((org.apache.activemq.command.ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setProducerId((org.apache.activemq.command.ProducerId)tightUnmarsalCachedObject(wireFormat,
+                                                                                             dataIn, bs));
         info.setProducerSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs));
         info.setBrokerSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs));
 
     }
 
-
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
@@ -81,20 +80,21 @@
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
         rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs);
-        rc+=tightMarshalLong1(wireFormat, info.getProducerSequenceId(), bs);
-        rc+=tightMarshalLong1(wireFormat, info.getBrokerSequenceId(), bs);
+        rc += tightMarshalLong1(wireFormat, info.getProducerSequenceId(), bs);
+        rc += tightMarshalLong1(wireFormat, info.getBrokerSequenceId(), bs);
 
         return rc + 0;
     }
 
     /**
      * Write a object instance to data output stream
-     *
+     * 
      * @param o the instance to be marshaled
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
      */
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs)
+        throws IOException {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         MessageId info = (MessageId)o;
@@ -106,7 +106,7 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
@@ -115,12 +115,12 @@
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         MessageId info = (MessageId)o;
-        info.setProducerId((org.apache.activemq.command.ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setProducerId((org.apache.activemq.command.ProducerId)looseUnmarsalCachedObject(wireFormat,
+                                                                                             dataIn));
         info.setProducerSequenceId(looseUnmarshalLong(wireFormat, dataIn));
         info.setBrokerSequenceId(looseUnmarshalLong(wireFormat, dataIn));
 
     }
-
 
     /**
      * Write the booleans that this object uses to a BooleanStream

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java Wed Aug  8 11:56:59 2007
@@ -24,29 +24,27 @@
 import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
-
-
 /**
  * Marshalling code for Open Wire Format for ProducerIdMarshaller
- *
- *
- * NOTE!: This file is auto generated - do not modify!
- *        if you need to make a change, please see the modify the groovy scripts in the
- *        under src/gram/script and then use maven openwire:generate to regenerate 
- *        this file.
- *
+ * 
+ * 
+ * NOTE!: This file is auto generated - do not modify! if you need to make a
+ * change, please see the modify the groovy scripts in the under src/gram/script
+ * and then use maven openwire:generate to regenerate this file.
+ * 
  * @version $Revision$
  */
 public class ProducerIdMarshaller extends BaseDataStreamMarshaller {
 
     /**
      * Return the type of Data Structure we marshal
+     * 
      * @return short representation of the type data structure
      */
     public byte getDataStructureType() {
         return ProducerId.DATA_STRUCTURE_TYPE;
     }
-    
+
     /**
      * @return a new object instance
      */
@@ -56,12 +54,13 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs)
+        throws IOException {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         ProducerId info = (ProducerId)o;
@@ -71,7 +70,6 @@
 
     }
 
-
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
@@ -81,20 +79,21 @@
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
         rc += tightMarshalString1(info.getConnectionId(), bs);
-        rc+=tightMarshalLong1(wireFormat, info.getValue(), bs);
-        rc+=tightMarshalLong1(wireFormat, info.getSessionId(), bs);
+        rc += tightMarshalLong1(wireFormat, info.getValue(), bs);
+        rc += tightMarshalLong1(wireFormat, info.getSessionId(), bs);
 
         return rc + 0;
     }
 
     /**
      * Write a object instance to data output stream
-     *
+     * 
      * @param o the instance to be marshaled
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
      */
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs)
+        throws IOException {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         ProducerId info = (ProducerId)o;
@@ -106,7 +105,7 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
@@ -120,7 +119,6 @@
         info.setSessionId(looseUnmarshalLong(wireFormat, dataIn));
 
     }
-
 
     /**
      * Write the booleans that this object uses to a BooleanStream

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java Wed Aug  8 11:56:59 2007
@@ -24,29 +24,27 @@
 import org.apache.activemq.openwire.*;
 import org.apache.activemq.command.*;
 
-
-
 /**
  * Marshalling code for Open Wire Format for SessionIdMarshaller
- *
- *
- * NOTE!: This file is auto generated - do not modify!
- *        if you need to make a change, please see the modify the groovy scripts in the
- *        under src/gram/script and then use maven openwire:generate to regenerate 
- *        this file.
- *
+ * 
+ * 
+ * NOTE!: This file is auto generated - do not modify! if you need to make a
+ * change, please see the modify the groovy scripts in the under src/gram/script
+ * and then use maven openwire:generate to regenerate this file.
+ * 
  * @version $Revision$
  */
 public class SessionIdMarshaller extends BaseDataStreamMarshaller {
 
     /**
      * Return the type of Data Structure we marshal
+     * 
      * @return short representation of the type data structure
      */
     public byte getDataStructureType() {
         return SessionId.DATA_STRUCTURE_TYPE;
     }
-    
+
     /**
      * @return a new object instance
      */
@@ -56,12 +54,13 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
      */
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs)
+        throws IOException {
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         SessionId info = (SessionId)o;
@@ -70,7 +69,6 @@
 
     }
 
-
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
@@ -80,19 +78,20 @@
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
         rc += tightMarshalString1(info.getConnectionId(), bs);
-        rc+=tightMarshalLong1(wireFormat, info.getValue(), bs);
+        rc += tightMarshalLong1(wireFormat, info.getValue(), bs);
 
         return rc + 0;
     }
 
     /**
      * Write a object instance to data output stream
-     *
+     * 
      * @param o the instance to be marshaled
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
      */
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs)
+        throws IOException {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         SessionId info = (SessionId)o;
@@ -103,7 +102,7 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
@@ -116,7 +115,6 @@
         info.setValue(looseUnmarshalLong(wireFormat, dataIn));
 
     }
-
 
     /**
      * Write the booleans that this object uses to a BooleanStream



Mime
View raw message