JAVA-1388: Changed check for non-existent collection to look for an errmsg that contains "ns not found". This will work with both mongod and mongos, the latter of which returns an errmsg that has "ns not found" embedded in the middle.

jyemin · jyemin · commit 11e44e345caf · 2014-08-18T15:01:02.000-04:00
diff --git a/driver-core/src/main/com/mongodb/operation/CommandOperationHelper.java b/driver-core/src/main/com/mongodb/operation/CommandOperationHelper.java
@@ -402,7 +402,7 @@ public void onResult(final CommandResult result, final MongoException e) {
 
     static void rethrowIfNotNamespaceError(final CommandFailureException e) {
         String message = e.getErrorMessage();
-        if (!message.startsWith("ns not found") && !(message.matches("Collection \\[(.*)\\] not found."))) {
+        if (!message.contains("ns not found")) {
             throw e;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ public void onResult(final CommandResult result, final MongoException e) {`
`402`	`402`
`403`	`403`	`static void rethrowIfNotNamespaceError(final CommandFailureException e) {`
`404`	`404`	`String message = e.getErrorMessage();`
`405`		`- if (!message.startsWith("ns not found") && !(message.matches("Collection \\[(.*)\\] not found."))) {`
	`405`	`+ if (!message.contains("ns not found")) {`
`406`	`406`	`throw e;`
`407`	`407`	`}`
`408`	`408`	`}`