prevent NPE in LDAP Provider when username is not found, OF-540

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

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

@@ -143,6 +143,10 @@ public class IQvCardHandler extends IQHandler {
                     result.setChildElement(packet.getChildElement().createCopy());
                     result.setError(PacketError.Condition.item_not_found);
                 }
+            } else {
+                result = IQ.createResultIQ(packet);
+                result.setChildElement(packet.getChildElement().createCopy());
+                result.setError(PacketError.Condition.item_not_found);
             }
         }
         else {

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

@@ -261,6 +261,9 @@ public class LdapVCardProvider implements VCardProvider, PropertyEventListener {
         username = JID.unescapeNode(username);
         Map<String, String> map = getLdapAttributes(username);
         Log.debug("LdapVCardProvider: Retrieving LDAP mapped vcard for " + username);
+        if (map.isEmpty()) {
+            return null;
+        }
         Element vcard = new VCard(template).getVCard(map);
         if (mergeVCard == null) {
             // No vcard passed in?  Hrm.  Fine, return LDAP vcard.