Print

Print


Commit in lcsim/src/org/lcsim/util/lcio on MAIN
SIOGenericObjectBlockHandler.java+2-21.1 -> 1.2
SIOGenericObject.java+5-31.4 -> 1.5
+7-5
2 modified files
GL: bug fix: GOBIT_FIXED behavior was inverted

lcsim/src/org/lcsim/util/lcio
SIOGenericObjectBlockHandler.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- SIOGenericObjectBlockHandler.java	9 Aug 2005 01:34:01 -0000	1.1
+++ SIOGenericObjectBlockHandler.java	18 Sep 2007 19:04:24 -0000	1.2
@@ -17,11 +17,11 @@
    void addCollectionElements(LCIOEvent event, LCIOCollection collection, SIOInputStream in, int n, int version) throws IOException
    {
       int flags = collection.getFlags();
-      if (!LCIOUtil.bitTest(flags,LCIOConstants.GOBIT_FIXED))
+      if (LCIOUtil.bitTest(flags,LCIOConstants.GOBIT_FIXED))
       {
          int nInt = in.readInt();
          int nFloat = in.readInt();
-         int nDouble = in.readInt();   
+         int nDouble = in.readInt();
          for (int i = 0; i < n; i++)
             collection.add(new SIOGenericObject(in, flags, version, nInt, nFloat, nDouble));
       }

lcsim/src/org/lcsim/util/lcio
SIOGenericObject.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- SIOGenericObject.java	14 Sep 2007 08:36:00 -0000	1.4
+++ SIOGenericObject.java	18 Sep 2007 19:04:24 -0000	1.5
@@ -9,7 +9,7 @@
 /**
  *
  * @author gaede
- * @version $Id: SIOGenericObject.java,v 1.4 2007/09/14 08:36:00 jeremy Exp $
+ * @version $Id: SIOGenericObject.java,v 1.5 2007/09/18 19:04:24 lima Exp $
  */
 class SIOGenericObject implements GenericObject
 {
@@ -46,7 +46,7 @@
       {
          _intVec[i] = in.readInt();
       }
-      
+
       _floatVec = new float[nFloat] ;
       for (int i=0; i<nFloat; i++)
       {
@@ -58,7 +58,9 @@
       {
          _doubleVec[i] = in.readDouble();
       }
-      //in.readPTag(this); 
+
+      // update pointer table
+      in.readPTag(this);
    }
    
    static void write(GenericObject object, SIOOutputStream out, int flag) throws IOException
CVSspam 0.2.8