You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2017/09/07 19:17:05 UTC
[geode] branch feature/GEODE-3557 updated (06c4830 -> c0c1abd)
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a change to branch feature/GEODE-3557
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 06c4830 Merge branch 'develop' into feature/GEODE-3557
new 9dbbf82 fixed macking for a junit test
add a94fd4d GEODE-3516: Avoid tryResume call to add the thread again into the waiting thread queue
add 51b13ab GEODE-3568: User can set a LuceneSerializer through the Java API
add 7ed3737 Revert "GEODE-3568: User can set a LuceneSerializer through the Java API"
add b92b9a9 GEODE-3555: proper new client protocol closure with more than max conns.
new c0c1abd Merge branch 'develop' into feature/GEODE-3557
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/geode/internal/cache/TXManagerImpl.java | 61 ++++++++++---------
.../internal/cache/tier/CommunicationMode.java | 8 +++
.../internal/cache/tier/sockets/AcceptorImpl.java | 14 +++--
.../internal/cache/TXManagerImplJUnitTest.java | 59 ++++++++++++++++++
.../ParallelQueueRemovalMessageJUnitTest.java | 3 +-
.../java/org/apache/geode/test/fake/Fakes.java | 1 +
.../RoundTripCacheConnectionJUnitTest.java | 69 ++++++++++++++++++++--
7 files changed, 174 insertions(+), 41 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].
[geode] 02/02: Merge branch 'develop' into feature/GEODE-3557
Posted by ds...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a commit to branch feature/GEODE-3557
in repository https://gitbox.apache.org/repos/asf/geode.git
commit c0c1abd7e6b7a3d017fcd9859b066adfea58933d
Merge: 9dbbf82 b92b9a9
Author: Darrel Schneider <ds...@pivotal.io>
AuthorDate: Thu Sep 7 12:16:39 2017 -0700
Merge branch 'develop' into feature/GEODE-3557
.../apache/geode/internal/cache/TXManagerImpl.java | 61 ++++++++++---------
.../internal/cache/tier/CommunicationMode.java | 8 +++
.../internal/cache/tier/sockets/AcceptorImpl.java | 14 +++--
.../internal/cache/TXManagerImplJUnitTest.java | 59 ++++++++++++++++++
.../RoundTripCacheConnectionJUnitTest.java | 69 ++++++++++++++++++++--
5 files changed, 171 insertions(+), 40 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@geode.apache.org" <co...@geode.apache.org>.
[geode] 01/02: fixed macking for a junit test
Posted by ds...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a commit to branch feature/GEODE-3557
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 9dbbf824602a4ab31d172e95f92f2c073c0c0c16
Author: Darrel Schneider <ds...@pivotal.io>
AuthorDate: Thu Sep 7 12:15:52 2017 -0700
fixed macking for a junit test
---
.../cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java | 3 ++-
geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
index 1a49cfd..64448e6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
@@ -44,6 +44,7 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.Scope;
import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.internal.cache.BucketAdvisor;
import org.apache.geode.internal.cache.BucketRegionQueue;
import org.apache.geode.internal.cache.BucketRegionQueueHelper;
@@ -274,7 +275,7 @@ public class ParallelQueueRemovalMessageJUnitTest {
private void createAndProcessParallelQueueRemovalMessage() {
ParallelQueueRemovalMessage message =
new ParallelQueueRemovalMessage(createRegionToDispatchedKeysMap());
- message.process(null);
+ message.process((DistributionManager)this.cache.getDistributionManager());
}
private HashMap<String, Map<Integer, List<Long>>> createRegionToDispatchedKeysMap() {
diff --git a/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java b/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java
index af38a1c..5a86fa7 100644
--- a/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java
+++ b/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java
@@ -97,6 +97,7 @@ public class Fakes {
when(distributionManager.getConfig()).thenReturn(config);
when(distributionManager.getSystem()).thenReturn(system);
when(distributionManager.getCancelCriterion()).thenReturn(systemCancelCriterion);
+ when(distributionManager.getCache()).thenReturn(cache);
return cache;
}
--
To stop receiving notification emails like this one, please contact
"commits@geode.apache.org" <co...@geode.apache.org>.