bug fixes

[IRC.git] / Robust / src / Analysis / Locality / TypeAnalysis.java

diff --git a/Robust/src/Analysis/Locality/TypeAnalysis.java b/Robust/src/Analysis/Locality/TypeAnalysis.java
index 6045213296e804a008f48b96f7fc4f8cad71bdac..194bc7381760fff9e14d4364527650d5fd3853aa 100644 (file)
--- a/Robust/src/Analysis/Locality/TypeAnalysis.java
+++ b/Robust/src/Analysis/Locality/TypeAnalysis.java
@@ -89,14 +89,19 @@ public class TypeAnalysis {
   }
   
   public Set<TypeDescriptor> expand(TypeDescriptor td) {
-    return namemap.get(td);
+    Set<TypeDescriptor> expandset=namemap.get(td);
+    return expandset;
   }
 
   public Set<TypeDescriptor> expandSet(Set<TypeDescriptor> tdset) {
     HashSet<TypeDescriptor> expandedSet=new HashSet<TypeDescriptor>();
     for(Iterator<TypeDescriptor> it=tdset.iterator();it.hasNext();) {
       TypeDescriptor td=it.next();
-      expandedSet.addAll(expand(td));
+      Set<TypeDescriptor> etdset=expand(td);
+      if (etdset==null)
+       expandedSet.add(td);
+      else
+       expandedSet.addAll(etdset);
     }
     return expandedSet;
   }