Updated Branches: refs/heads/master ea73ffedc -> a6869ee26
CAMEL-6515 camel-mongodb: Upgrade MongoDB driver from 2.9.1 to 2.11.2 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a6869ee2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a6869ee2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a6869ee2 Branch: refs/heads/master Commit: a6869ee26c2f52ba2f18e2771b96e667d3b4ca48 Parents: ea73ffe Author: RauÌl Kripalani <ra...@apache.org> Authored: Sun Jul 7 23:06:36 2013 +0100 Committer: RauÌl Kripalani <ra...@apache.org> Committed: Sun Jul 7 23:09:16 2013 +0100 ---------------------------------------------------------------------- .../org/apache/camel/component/mongodb/MongoDbOperation.java | 2 +- .../apache/camel/component/mongodb/MongoDbTailingProcess.java | 3 +++ .../apache/camel/component/mongodb/AbstractMongoDbTest.java | 7 +++---- .../apache/camel/component/mongodb/MongoDbOperationsTest.java | 1 - parent/pom.xml | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a6869ee2/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbOperation.java ---------------------------------------------------------------------- diff --git a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbOperation.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbOperation.java index bb6ee6a..fe7570f 100644 --- a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbOperation.java +++ b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbOperation.java @@ -33,7 +33,7 @@ public enum MongoDbOperation { // delete operations remove, - //aggregat + // aggregate aggregate, // others http://git-wip-us.apache.org/repos/asf/camel/blob/a6869ee2/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbTailingProcess.java ---------------------------------------------------------------------- diff --git a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbTailingProcess.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbTailingProcess.java index 42cb4f1..079dc0b 100644 --- a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbTailingProcess.java +++ b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoDbTailingProcess.java @@ -160,6 +160,9 @@ public class MongoDbTailingProcess implements Runnable { if (keepRunning) { LOG.debug("Cursor not found exception from MongoDB, will regenerate cursor. This is normal behaviour with tailable cursors.", e); } + } catch (NullPointerException e) { + // The MongoDB Java Driver throws this uncontrolled NPE when the cursor is closed while blocked at DBCursor#hasMore. + // See https://jira.mongodb.org/browse/JAVA-605 } // the loop finished, persist the lastValue just in case we are shutting down http://git-wip-us.apache.org/repos/asf/camel/blob/a6869ee2/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/AbstractMongoDbTest.java ---------------------------------------------------------------------- diff --git a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/AbstractMongoDbTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/AbstractMongoDbTest.java index f6f4698..66f2a5c 100644 --- a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/AbstractMongoDbTest.java +++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/AbstractMongoDbTest.java @@ -25,7 +25,8 @@ import com.mongodb.DB; import com.mongodb.DBCollection; import com.mongodb.DBObject; import com.mongodb.Mongo; -import com.mongodb.MongoURI; +import com.mongodb.MongoClient; +import com.mongodb.MongoClientURI; import com.mongodb.WriteConcern; import com.mongodb.util.JSON; @@ -36,12 +37,10 @@ import org.apache.camel.spring.SpringCamelContext; import org.apache.camel.test.junit4.CamelTestSupport; import org.apache.camel.util.IOHelper; import org.apache.camel.util.ObjectHelper; - import org.junit.After; import org.junit.Assume; import org.junit.Before; import org.junit.BeforeClass; - import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -72,7 +71,7 @@ public abstract class AbstractMongoDbTest extends CamelTestSupport { properties.load(is); // ping Mongo and populate db and collection try { - mongo = new Mongo(new MongoURI(properties.getProperty("mongodb.connectionURI"))); + mongo = new MongoClient(new MongoClientURI(properties.getProperty("mongodb.connectionURI"))); mongo.getDatabaseNames(); dbName = properties.getProperty("mongodb.testDb"); db = mongo.getDB(dbName); http://git-wip-us.apache.org/repos/asf/camel/blob/a6869ee2/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbOperationsTest.java ---------------------------------------------------------------------- diff --git a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbOperationsTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbOperationsTest.java index 3176abe..51caa1c 100644 --- a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbOperationsTest.java +++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbOperationsTest.java @@ -25,7 +25,6 @@ import com.mongodb.WriteResult; import com.mongodb.util.JSON; import org.apache.camel.builder.RouteBuilder; - import org.junit.Test; public class MongoDbOperationsTest extends AbstractMongoDbTest { http://git-wip-us.apache.org/repos/asf/camel/blob/a6869ee2/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index c0d3e52..60618bb 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -279,7 +279,7 @@ <mina2-version>2.0.7</mina2-version> <mock-javamail-version>1.7</mock-javamail-version> <mockito-version>1.9.5</mockito-version> - <mongo-java-driver-version>2.9.1</mongo-java-driver-version> + <mongo-java-driver-version>2.11.2</mongo-java-driver-version> <mqtt-client-version>1.5</mqtt-client-version> <msv-version>20050913</msv-version> <mustache-java-version>0.8.12</mustache-java-version>
