Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 82E0C200C8C for ; Mon, 22 May 2017 23:02:11 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 80C70160BD4; Mon, 22 May 2017 21:02:11 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C8050160BD5 for ; Mon, 22 May 2017 23:02:10 +0200 (CEST) Received: (qmail 10383 invoked by uid 500); 22 May 2017 21:02:10 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 10254 invoked by uid 99); 22 May 2017 21:02:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 May 2017 21:02:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 326B2E7DA2; Mon, 22 May 2017 21:02:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jasonhuynh@apache.org To: commits@geode.apache.org Date: Mon, 22 May 2017 21:02:13 -0000 Message-Id: <940d54aee0804acc8a7c633a836b5112@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/5] geode git commit: GEODE-269: spotlessApply on merge resolution archived-at: Mon, 22 May 2017 21:02:11 -0000 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 Authored: Mon May 22 13:59:23 2017 -0700 Committer: Jason Huynh 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();