Commit in lcsim/src/org/lcsim on MAIN
recon/cluster/directedtree/TrackMatchingDriver.java+2-11.6 -> 1.7
recon/cluster/util/BasicCluster.java+5-11.14 -> 1.15
util/lcio/SIOCluster.java+7-11.5 -> 1.6
+14-3
3 modified files
GL: fix some memory leaks

lcsim/src/org/lcsim/recon/cluster/directedtree
TrackMatchingDriver.java 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- TrackMatchingDriver.java	21 Jun 2006 18:03:02 -0000	1.6
+++ TrackMatchingDriver.java	9 Jul 2006 12:59:04 -0000	1.7
@@ -27,7 +27,7 @@
  * A driver for track matching using the swimmer.
  *
  * @author Guilherme Lima
- * @version $Id: TrackMatchingDriver.java,v 1.6 2006/06/21 18:03:02 lima Exp $
+ * @version $Id: TrackMatchingDriver.java,v 1.7 2006/07/09 12:59:04 lima Exp $
  */
 public class TrackMatchingDriver extends Driver {
 
@@ -182,6 +182,7 @@
       // cleanup
       emInterceptsMap.clear();
       hadInterceptsMap.clear();
+      trkHitsMap.clear();
     }
 
     private void reset() {

lcsim/src/org/lcsim/recon/cluster/util
BasicCluster.java 1.14 -> 1.15
diff -u -r1.14 -r1.15
--- BasicCluster.java	6 Jul 2006 00:33:57 -0000	1.14
+++ BasicCluster.java	9 Jul 2006 12:59:05 -0000	1.15
@@ -330,7 +330,11 @@
         {
             hitSet.addAll( clus.getCalorimeterHits() );
         }
-        return hitSet.size();
+
+	// cleanup and return
+	int size = hitSet.size();
+	hitSet.clear();
+        return size;
     }
 
     /**

lcsim/src/org/lcsim/util/lcio
SIOCluster.java 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- SIOCluster.java	15 Mar 2006 11:48:01 -0000	1.5
+++ SIOCluster.java	9 Jul 2006 12:59:05 -0000	1.6
@@ -120,6 +120,7 @@
          {
             calorimeterHits.add((CalorimeterHit) ref.getObject());
          }
+	 tempHits.clear();
          tempHits = null;
       }
       if(calorimeterHits==null) return Collections.EMPTY_LIST;
@@ -135,6 +136,7 @@
          {
             clusters.add((Cluster) ref.getObject());
          }
+	 tempClusters.clear();
          tempClusters = null;
       }
       return clusters;
@@ -271,7 +273,11 @@
         {
             hitSet.addAll( clus.getCalorimeterHits() );
         }
-        return hitSet.size();
+
+	// cleanup and return
+	int size = hitSet.size();
+	hitSet.clear();
+        return size;
     }
 
     /**
CVSspam 0.2.8