[JM-1240] Fixed NPE when removing PHOTO. (deleting avatar)

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

src/java/org/jivesoftware/openfire/ldap/LdapVCardProvider.java

@@ -378,10 +378,12 @@ public class LdapVCardProvider implements VCardProvider, PropertyEventListener {
             }
             else {
                 Element newPhotoElem = newvCard.element("PHOTO");
+                if (newPhotoElem == null) {
+                    Log.debug("LdapVCardProvider: Photo element was removed, accepting update.");
+                    return true;
+                }
                 // Note: NodeComparator never seems to consider these equal, even if they are?
                 if (!dbPhotoElem.asXML().equals(newPhotoElem.asXML())) {
-                    Log.debug("LdapVCardProvider: DB photo element is:\n"+dbPhotoElem.asXML());
-                    Log.debug("LdapVCardProvider: New photo element is:\n"+newPhotoElem.asXML());
                     // Photo element was changed.  Ignore all other changes and accept this.
                     Log.debug("LdapVCardProvider: PHOTO element changed, accepting update.");
                     return true;