Print

Print


Commit in lcio/src/java/hep/lcio/implementation/sio on MAIN
SIOLCCollection.java+8-71.3 -> 1.4
Fix bug in SIOLCCollection when dealing with subsets

lcio/src/java/hep/lcio/implementation/sio
SIOLCCollection.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- SIOLCCollection.java	7 Nov 2007 20:46:22 -0000	1.3
+++ SIOLCCollection.java	29 Jun 2010 22:27:54 -0000	1.4
@@ -10,7 +10,7 @@
 /**
  *
  * @author Tony Johnson
- * @version $Id: SIOLCCollection.java,v 1.3 2007/11/07 20:46:22 jeremy Exp $
+ * @version $Id: SIOLCCollection.java,v 1.4 2010/06/29 22:27:54 tonyj Exp $
  */
 class SIOLCCollection extends ILCCollection
 {
@@ -44,13 +44,14 @@
    /** for collections that hold subsets resolve the stored pointers (SIORefs)*/
    public void resolve()
    {
-      for (Iterator i = tempObjects.iterator(); i.hasNext();)
-      {
-         add(((SIORef) i.next()).getObject());
+      if (tempObjects != null) {
+         for (Iterator i = tempObjects.iterator(); i.hasNext();)
+         {
+            add(((SIORef) i.next()).getObject());
+         }
+         tempObjects = null;
       }
-      tempObjects = null;
-
    }
    
    
-}
\ No newline at end of file
+}
CVSspam 0.2.8