Fix that damn thing

Author: remyUilicious

src/main/java/picoded/dstack/mongodb/MongoDB_DataObjectMap.java

@@ -222,6 +222,7 @@ public Map<String, Object> DataObjectRemoteDataMap_get(String _oid) {
 	 **/
 	public void DataObjectRemoteDataMap_update(String _oid, Map<String, Object> fullMap,
 		Set<String> updateKeys) {
+
 
 		// Configure this to be an "upsert" query
 		FindOneAndUpdateOptions opt = new FindOneAndUpdateOptions();
@@ -236,7 +237,9 @@ public void DataObjectRemoteDataMap_update(String _oid, Map<String, Object> full
 		Document unset_doc = new Document();
 
 		// Lets iterate the keys, and decide accordingly
-		Set<String> fullKeys = fullMap.keySet();
+		Set<String> fullKeys = new HashSet<String>(fullMap.keySet());
+		fullKeys.addAll(updateKeys);
+
 		for (String key : fullKeys) {
 			// Get the value
 			Object value = fullMap.get(key);
@@ -268,13 +271,10 @@ public void DataObjectRemoteDataMap_update(String _oid, Map<String, Object> full
 			if (updateKeys.contains(key)) {
 				// Handle NULL values unset
 				if (value == null || value == ObjectToken.NULL) {
-					// In theory this should have worked
+
 					unset_doc.append(key, "");
+					continue;
 
-					// // But it didn't so i tried this instead
-					// set_doc.append(key, null);
-					// setOnInsert_doc.append(key, null);
-					// continue;
 				}
 
 				// Handle values update
@@ -290,6 +290,7 @@ public void DataObjectRemoteDataMap_update(String _oid, Map<String, Object> full
 				setOnInsert_doc.append(key, value);
 			}
 		}
+
 
 		// Generate the "update" doc
 		Document updateDoc = new Document();

src/test/java/picoded/dstack/struct/simple/StructSimple_DataObjectMap_test.java

@@ -59,9 +59,9 @@ public void constructorTest() {
 	// Subset assertion
 	//-----------------------------------------------
 
-	/// Utility function, to ensure the expected values exists in map
-	/// while allowing future test cases not to break when additional values
-	/// like create timestamp is added.
+	// Utility function, to ensure the expected values exists in map
+	// while allowing future test cases not to break when additional values
+	// like create timestamp is added.
 	public void assetSubset(Map<String, Object> expected, Map<String, Object> result) {
 		for (Map.Entry<String, Object> entry : expected.entrySet()) {
 			assertEquals(entry.getValue(), result.get(entry.getKey()));
@@ -86,10 +86,9 @@ protected HashMap<String, Object> randomObjMap() {
 	}
 
 	// @Test
-	// public void invalidSetup() { //Numeric as table prefix tend to cuase
-	// problems
+	// public void invalidSetup() { 
+	// //Numeric as table prefix tend to cause problems
 	// DataObjectMap m;
-	//
 	// try {
 	// m = new DataObjectMap(JStackObj, "1" + TestConfig.randomTablePrefix());
 	// fail(); // if we got here, no exception was thrown, which is bad
@@ -139,7 +138,7 @@ public void basicTest() {
 		assetSubset(objMap, mtObj.get(guid));
 	}
 
-	/// Checks if a blank object gets saved
+	// Checks if a blank object gets saved
 	@Test
 	public void blankObjectSave() {
 		String guid = null;
@@ -607,7 +606,7 @@ public void getKeyNamesTest() {
 	// }
 
 	// remove meta object support
-	//-----------------------------------------------
+	// -----------------------------------------------
 	@Test
 	public void removePropertyViaDataObject_saveDelta() {
 
@@ -622,10 +621,11 @@ public void removePropertyViaDataObject_saveDelta() {
 		// Lets get the first object
 		DataObject testObject = oRes[0];
 		String oid = testObject._oid();
+
 		testObject.remove("num");
 		testObject.remove("str_val");
 		testObject.saveDelta();
-		
+
 		// Get the object again
 		DataObject changedObject = mtObj.get(oid);
 		assertNotNull( changedObject );
@@ -640,7 +640,7 @@ public void removePropertyViaDataObject_saveAll() {
 
 		// Lets just rescycle old test for some dummy data
 		basicTest();
-		
+
 		// Lets get DataObject list
 		DataObject[] oRes = null;
 		assertNotNull(oRes = mtObj.query(null, null));
@@ -649,10 +649,11 @@ public void removePropertyViaDataObject_saveAll() {
 		// Lets get the first object
 		DataObject testObject = oRes[0];
 		String oid = testObject._oid();
+
 		testObject.remove("num");
 		testObject.remove("str_val");
 		testObject.saveAll();
-		
+
 		// Get the object again
 		DataObject changedObject = mtObj.get(oid);
 		assertNotNull( changedObject );