Author: mreutegg
Date: Thu Jan 7 10:03:51 2016
New Revision: 1723502
URL: http://svn.apache.org/viewvc?rev=1723502&view=rev
Log:
OAK-2592: Commit does not ensure w:majority
Update driver to version 2.14.0
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java
jackrabbit/oak/trunk/oak-parent/pom.xml
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java?rev=1723502&r1=1723501&r2=1723502&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java
Thu Jan 7 10:03:51 2016
@@ -162,6 +162,9 @@ public class MongoConnection {
int w;
if (wObj instanceof Number) {
w = ((Number) wObj).intValue();
+ } else if (wObj == null) {
+ // default acknowledged
+ w = 1;
} else if (WriteConcern.MAJORITY.getWString().equals(wObj)) {
// majority in a replica set means at least w=2
w = 2;
Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1723502&r1=1723501&r2=1723502&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Thu Jan 7 10:03:51 2016
@@ -49,7 +49,7 @@
<mongo.db2>MongoMKDB2</mongo.db2>
<segment.db>SegmentMK</segment.db>
<lucene.version>4.7.1</lucene.version>
- <mongo.driver.version>2.13.3</mongo.driver.version>
+ <mongo.driver.version>2.14.0</mongo.driver.version>
<!-- Note that we're using SLF4J API version 1.7 when compiling -->
<!-- core Oak components but more recent SLF4J and Logback versions -->
<!-- when compiling and running test cases and the oak-run jar. -->
