GEODE-269: spotlessApply on merge resolution
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/f1280fe8 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/f1280fe8 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/f1280fe8 Branch: refs/heads/develop Commit: f1280fe89984b6f5034708524db6278ec476439b Parents: 227f08b Author: Jason Huynh <[email protected]> Authored: Mon May 22 13:59:23 2017 -0700 Committer: Jason Huynh <[email protected]> Committed: Mon May 22 13:59:23 2017 -0700 ---------------------------------------------------------------------- .../management/internal/cli/commands/ShowDeadlockDUnitTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/f1280fe8/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 62dcf32..e7ae38e 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 @@ -173,8 +173,7 @@ public class ShowDeadlockDUnitTest extends JUnit4CacheTestCase { vm0.invokeAsync(() -> { 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();
