commit b4036b602eb837062390d78f193113406eb1455f
author buyingyi <buyingyi@123451ca-8445-de46-9d55-352943316053> Fri Feb 22 05:29:16 2013 +0000
committer buyingyi <buyingyi@123451ca-8445-de46-9d55-352943316053> Fri Feb 22 05:29:16 2013 +0000
tree 1ae2fbdb23baa48dbc7711b867fa8b3bfad30dce
parent 4d38f455c3979fa0fa647cb951afcb99dffe07d6

make asterix tests pass

git-svn-id: https://hyracks.googlecode.com/svn/branches/fullstack_job_rewriter@2971 123451ca-8445-de46-9d55-352943316053

hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/rewriter/ActivityClusterGraphRewriter.java

diff --git a/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/rewriter/ActivityClusterGraphRewriter.java b/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/rewriter/ActivityClusterGraphRewriter.java
index 573f105..b81928b 100644
--- a/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/rewriter/ActivityClusterGraphRewriter.java
+++ b/hyracks/hyracks-api/src/main/java/edu/uci/ics/hyracks/api/rewriter/ActivityClusterGraphRewriter.java
@@ -347,6 +347,8 @@
         }
         Queue<IActivity> tbeQueue = toBeExpendedMap.get(superActivityId);
         Queue<IActivity> existingTbeQueque = toBeExpendedMap.remove(existingSuperActivityId);
-        tbeQueue.addAll(existingTbeQueque);
+        if (existingTbeQueque != null) {
+            tbeQueue.addAll(existingTbeQueque);
+        }
     }
 }