GEODE-269 : Resolving conflicts with develop.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/3054de42 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/3054de42 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/3054de42 Branch: refs/heads/develop Commit: 3054de42d38aa8bfadd8912f0ab4dde259a701ef Parents: 929687e Author: Deepak Dixit <[email protected]> Authored: Fri May 12 14:08:21 2017 +0530 Committer: Deepak Dixit <[email protected]> Committed: Fri May 12 14:08:21 2017 +0530 ---------------------------------------------------------------------- .../management/internal/cli/commands/ShowDeadlockDUnitTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/3054de42/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java ---------------------------------------------------------------------- diff --git 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 index 3fc816a..9254877 100644 --- 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 @@ -177,8 +177,7 @@ public class ShowDeadlockDUnitTest extends JUnit4CacheTestCase { public void run() { lock.lock(); - ResultCollector collector = - FunctionService.onMember(member).execute(new TestFunction()); + ResultCollector collector = FunctionService.onMember(member).execute(new TestFunction()); // wait the function to lock the lock on member. collector.getResult(); lock.unlock();
