ensure non-null query

mongodb · Jun 25, 2012 · 19b5eca · 19b5eca
1 parent 256dd3f
commit 19b5eca
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/main/com/mongodb/QueryOpBuilder.java b/src/main/com/mongodb/QueryOpBuilder.java
@@ -99,10 +99,17 @@ public QueryOpBuilder addSnapshot(boolean snapshot){
 	 * @return DBObject representing the query command to be sent to server
 	 */
 	public DBObject get(){
+		DBObject lclQuery = query;
+
+		//must always have a query
+		if(lclQuery == null){
+			lclQuery = new BasicDBObject();
+		}
+
 		if(hasSpecialQueryFields()){
 			DBObject queryop = (specialFields == null ? new BasicDBObject() : specialFields);
 
-            addToQueryObject(queryop, "query", query, true);
+            addToQueryObject(queryop, "query", lclQuery, true);
             addToQueryObject(queryop, "orderby", orderBy, false);
             if (hintStr != null)
                 addToQueryObject(queryop, "$hint", hintStr);
@@ -117,7 +124,7 @@ public DBObject get(){
             return queryop;
 		}
 
-		return query;
+		return lclQuery;
 	}
 
     private boolean hasSpecialQueryFields(){