incubator-apex-core git commit: APEXCORE-130 - Throwing A Runtime Exception In Setup Causes The Operator To Block. Moved thread assignment from node active() to StreamingContainer.

[thw]

Repository: incubator-apex-core
Updated Branches:
  refs/heads/release-3.3 c210e35f1 -> cd09fda2c


APEXCORE-130 - Throwing A Runtime Exception In Setup Causes The Operator To 
Block. Moved thread assignment from node active() to StreamingContainer.

Conflicts:
        engine/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/cd09fda2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/cd09fda2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/cd09fda2

Branch: refs/heads/release-3.3
Commit: cd09fda2cb54152bfee5486114024596f7aa5aa9
Parents: c210e35
Author: Vlad Rozov <v.ro...@datatorrent.com>
Authored: Mon Feb 29 15:16:35 2016 -0800
Committer: Thomas Weise <tho...@datatorrent.com>
Committed: Mon Feb 29 19:58:42 2016 -0800

----------------------------------------------------------------------
 .../main/java/com/datatorrent/stram/engine/Node.java   |  1 -
 .../datatorrent/stram/engine/StreamingContainer.java   | 13 ++++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/cd09fda2/engine/src/main/java/com/datatorrent/stram/engine/Node.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/engine/Node.java 
b/engine/src/main/java/com/datatorrent/stram/engine/Node.java
index d4970cd..edb4455 100644
--- a/engine/src/main/java/com/datatorrent/stram/engine/Node.java
+++ b/engine/src/main/java/com/datatorrent/stram/engine/Node.java
@@ -614,7 +614,6 @@ public abstract class Node<OPERATOR extends Operator> 
implements Component<Opera
       CHECKPOINT_WINDOW_COUNT = 1;
     }
 
-    context.setThread(Thread.currentThread());
     activateSinks();
     if (operator instanceof Operator.ActivationListener) {
       ((Operator.ActivationListener<OperatorContext>) 
operator).activate(context);

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/cd09fda2/engine/src/main/java/com/datatorrent/stram/engine/StreamingContainer.java
----------------------------------------------------------------------
diff --git 
a/engine/src/main/java/com/datatorrent/stram/engine/StreamingContainer.java 
b/engine/src/main/java/com/datatorrent/stram/engine/StreamingContainer.java
index 79d9037..f289ce3 100644
--- a/engine/src/main/java/com/datatorrent/stram/engine/StreamingContainer.java
+++ b/engine/src/main/java/com/datatorrent/stram/engine/StreamingContainer.java
@@ -1351,7 +1351,13 @@ public class StreamingContainer extends YarnContainerMain
       }
 
       final Node<?> node = nodes.get(ndi.id);
-      new 
Thread(Integer.toString(ndi.id).concat("/").concat(ndi.name).concat(":").concat(node.getOperator().getClass().getSimpleName()))
+      final String name = new StringBuilder(Integer.toString(ndi.id))
+          .append('/')
+          .append(ndi.name)
+          .append(':')
+          .append(node.getOperator().getClass().getSimpleName())
+          .toString();
+      final Thread thread = new Thread(name)
       {
         @Override
         public void run()
@@ -1437,8 +1443,9 @@ public class StreamingContainer extends YarnContainerMain
             }
           }
         }
-
-      }.start();
+      };
+      node.context.setThread(thread);
+      thread.start();
     }
 
     /**