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.2 13bb0f488 -> 9df652132


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/9df65213
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/9df65213
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/9df65213

Branch: refs/heads/release-3.2
Commit: 9df6521323d1888f6adaee94bb17e6b0ecbc2e2d
Parents: 13bb0f4
Author: Vlad Rozov <v.ro...@datatorrent.com>
Authored: Mon Feb 29 15:16:35 2016 -0800
Committer: Thomas Weise <tho...@datatorrent.com>
Committed: Tue Mar 1 00:00:45 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/9df65213/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 b073dcd..d04a4d0 100644
--- a/engine/src/main/java/com/datatorrent/stram/engine/Node.java
+++ b/engine/src/main/java/com/datatorrent/stram/engine/Node.java
@@ -577,7 +577,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/9df65213/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 a17dfdf..12a9ff3 100644
--- a/engine/src/main/java/com/datatorrent/stram/engine/StreamingContainer.java
+++ b/engine/src/main/java/com/datatorrent/stram/engine/StreamingContainer.java
@@ -1349,7 +1349,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()
@@ -1444,8 +1450,9 @@ public class StreamingContainer extends YarnContainerMain
             }
           }
         }
-
-      }.start();
+      };
+      node.context.setThread(thread);
+      thread.start();
     }
 
     /**