Delete a property when the value is empty. JM-275

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@1304 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/messenger/VCardManager.java

@@ -108,8 +108,10 @@ public class VCardManager {
             properties = loadPropertiesFromDb(username);
             vcardCache.put(username, properties);
         }
-        properties.remove(name);
-        deletePropertyFromDb(username, name);
+        if (properties.remove(name) != null) {
+            // Delete the property from the DB if it was present in memory
+            deletePropertyFromDb(username, name);
+        }
     }
 
     /**

src/java/org/jivesoftware/messenger/handler/IQvCardHandler.java

@@ -139,6 +139,10 @@ public class IQvCardHandler extends IQHandler {
                     VCardManager.getInstance().setVCardProperty(user.getUsername(),
                             createName(nameStack), value);
                 }
+                else {
+                    VCardManager.getInstance().deleteVCardProperty(user.getUsername(),
+                            createName(nameStack));
+                }
             }
             readVCard(child, nameStack, user);
             nameStack.remove(nameStack.size() - 1);