Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1D8E318EBA for ; Fri, 8 Jan 2016 23:37:13 +0000 (UTC) Received: (qmail 84861 invoked by uid 500); 8 Jan 2016 23:37:13 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 84752 invoked by uid 500); 8 Jan 2016 23:37:13 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 84735 invoked by uid 99); 8 Jan 2016 23:37:13 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Jan 2016 23:37:12 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 6DD001804DE for ; Fri, 8 Jan 2016 23:37:12 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.227 X-Spam-Level: * X-Spam-Status: No, score=1.227 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.554, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id pq8EQaM_YweC for ; Fri, 8 Jan 2016 23:37:11 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id B546743A7E for ; Fri, 8 Jan 2016 23:37:03 +0000 (UTC) Received: (qmail 83062 invoked by uid 99); 8 Jan 2016 23:37:03 -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; Fri, 08 Jan 2016 23:37:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 607DCE3859; Fri, 8 Jan 2016 23:37:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.incubator.apache.org Date: Fri, 08 Jan 2016 23:37:31 -0000 Message-Id: In-Reply-To: <28d9f2c3ae2c498882164a0dfa1c83c9@git.apache.org> References: <28d9f2c3ae2c498882164a0dfa1c83c9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [30/45] incubator-geode git commit: GEODE-412 We were re-setting the value count after getting its value. Sepatrated that logic as test may look this count more than once. GEODE-412 We were re-setting the value count after getting its value. Sepatrated that logic as test may look this count more than once. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/531b8aae Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/531b8aae Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/531b8aae Branch: refs/heads/feature/GEODE-715 Commit: 531b8aaeb10fa5c5d2b9729d247fee8aceb5f253 Parents: a097fcf Author: Hitesh Khamesra Authored: Thu Jan 7 16:06:43 2016 -0800 Committer: Hitesh Khamesra Committed: Thu Jan 7 16:12:51 2016 -0800 ---------------------------------------------------------------------- .../cache/execute/OnGroupsFunctionExecutionDUnitTest.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/531b8aae/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java index 5a642ca..6cb1ffd 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java @@ -181,7 +181,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { int count = 0; synchronized (OnGroupsFunction.class) { count = f.invocationCount; - f.invocationCount = 0; + // f.invocationCount = 0; } return count; @@ -746,7 +746,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { } else { e.execute(new OnGroupsFunction()).getResult(); } - return null; + return null; } }); verifyAndResetInvocationCount(server0, 1); @@ -1235,5 +1235,8 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase { } }; DistributedTestCase.waitForCriterion(wc2, 30000, 1000, true); + resetInvocationCount(server0); + resetInvocationCount(server1); + resetInvocationCount(server2); } }