Merge branch 'APEXCORE-608' of https://github.com/vrozov/apex-core
Project: http://git-wip-us.apache.org/repos/asf/apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/apex-core/commit/32f229f2 Tree: http://git-wip-us.apache.org/repos/asf/apex-core/tree/32f229f2 Diff: http://git-wip-us.apache.org/repos/asf/apex-core/diff/32f229f2 Branch: refs/heads/master Commit: 32f229f21b3a6a3887d1cc52585e91b50a0c5491 Parents: d80501b c687bb5 Author: Thomas Weise <[email protected]> Authored: Sat Feb 18 16:40:05 2017 -0800 Committer: Thomas Weise <[email protected]> Committed: Sat Feb 18 16:40:05 2017 -0800 ---------------------------------------------------------------------- .../datatorrent/stram/RecoverableRpcProxy.java | 147 ++++++++++--------- .../datatorrent/stram/StramLocalCluster.java | 10 +- .../stram/StreamingContainerParent.java | 44 +++--- .../StreamingContainerUmbilicalProtocol.java | 4 +- .../stram/engine/StreamingContainer.java | 60 +++++--- .../datatorrent/stram/StramRecoveryTest.java | 12 +- 6 files changed, 150 insertions(+), 127 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/apex-core/blob/32f229f2/engine/src/main/java/com/datatorrent/stram/StramLocalCluster.java ----------------------------------------------------------------------
