You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by to...@apache.org on 2017/02/14 13:33:53 UTC
svn commit: r1782963 -
/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/replica/ReplicaSetInfo.java
Author: tomekr
Date: Tue Feb 14 13:33:53 2017
New Revision: 1782963
URL: http://svn.apache.org/viewvc?rev=1782963&view=rev
Log:
OAK-5636: potential NPE in ReplicaSetInfo
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/replica/ReplicaSetInfo.java
Modified: jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/replica/ReplicaSetInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/replica/ReplicaSetInfo.java?rev=1782963&r1=1782962&r2=1782963&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/replica/ReplicaSetInfo.java (original)
+++ jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/replica/ReplicaSetInfo.java Tue Feb 14 13:33:53 2017
@@ -250,18 +250,22 @@ public class ReplicaSetInfo implements R
}
}
+ Set<String> hostsToCheck = new HashSet<String>();
if (secondaries.isEmpty()) {
LOG.debug("No secondaries found: {}", members);
unknownState = true;
+ } else {
+ hostsToCheck.addAll(secondaries);
}
if (primary == null) {
LOG.debug("No primary found: {}", members);
unknownState = true;
+ } else {
+ hostsToCheck.add(primary);
}
Map<String, Timestamped<RevisionVector>> vectors = null;
- Set<String> hostsToCheck = union(secondaries, of(primary));
if (!unknownState) {
vectors = getRootRevisions(hostsToCheck);
if (vectors.containsValue(null)) {