Merge branch 'feature/GEODE-269' of https://github.com/deepakddixit/incubator-geode into develop
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/227f08be Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/227f08be Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/227f08be Branch: refs/heads/develop Commit: 227f08be636d12d5e4a268a7039acae528c341d4 Parents: aa189b1 3054de4 Author: Jason Huynh <huyn...@gmail.com> Authored: Mon May 22 12:18:13 2017 -0700 Committer: Jason Huynh <huyn...@gmail.com> Committed: Mon May 22 12:18:13 2017 -0700 ---------------------------------------------------------------------- .../catalina/PeerToPeerSessionCache.java | 2 +- .../modules/util/BootstrappingFunction.java | 2 +- .../geode/cache/execute/FunctionService.java | 49 -------------------- .../management/MemoryThresholdsDUnitTest.java | 32 ++++++------- .../ClassPathLoaderIntegrationTest.java | 6 +-- .../geode/internal/cache/CommitFunction.java | 3 +- .../cache/RemoteTransactionDUnitTest.java | 12 ++--- .../geode/internal/cache/RollbackFunction.java | 3 +- .../execute/FunctionServiceStatsDUnitTest.java | 2 +- .../LocalFunctionExecutionDUnitTest.java | 4 +- .../MemberFunctionExecutionDUnitTest.java | 33 +++++++------ .../DeployCommandRedeployDUnitTest.java | 3 +- .../cli/commands/ShowDeadlockDUnitTest.java | 2 +- 13 files changed, 49 insertions(+), 104 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/227f08be/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/227f08be/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DeployCommandRedeployDUnitTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/227f08be/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java ---------------------------------------------------------------------- diff --cc geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java index b6e7c36,9254877..62dcf32 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java @@@ -170,14 -170,18 +170,14 @@@ public class ShowDeadlockDUnitTest exte } private void lockTheLocks(VM vm0, final InternalDistributedMember member) { - vm0.invokeAsync(new SerializableRunnable() { - - private static final long serialVersionUID = 1L; - - public void run() { - lock.lock(); - - ResultCollector collector = FunctionService.onMember(member).execute(new TestFunction()); - // wait the function to lock the lock on member. - collector.getResult(); - lock.unlock(); - } + vm0.invokeAsync(() -> { + lock.lock(); + + ResultCollector collector = - FunctionService.onMember(basicGetSystem(), member).execute(new TestFunction()); ++ FunctionService.onMember(member).execute(new TestFunction()); + // wait the function to lock the lock on member. + collector.getResult(); + lock.unlock(); }); }