Commit babd6bc3 authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gato

Fixed NPE when trying to load a vCard of a non-existent user. JM-889

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/branches@5917 b35dd754-fafc-0310-a699-88a17e54d16e
parent 58daebad
...@@ -130,7 +130,7 @@ public class LdapVCardProvider implements VCardProvider, PropertyEventListener { ...@@ -130,7 +130,7 @@ public class LdapVCardProvider implements VCardProvider, PropertyEventListener {
private Map<String, String> getLdapAttributes(String username) { private Map<String, String> getLdapAttributes(String username) {
// Un-escape username // Un-escape username
username = JID.unescapeNode(username); username = JID.unescapeNode(username);
HashMap<String, String> map = new HashMap<String, String>(); Map<String, String> map = new HashMap<String, String>();
DirContext ctx = null; DirContext ctx = null;
try { try {
...@@ -156,7 +156,7 @@ public class LdapVCardProvider implements VCardProvider, PropertyEventListener { ...@@ -156,7 +156,7 @@ public class LdapVCardProvider implements VCardProvider, PropertyEventListener {
} }
catch (Exception e) { catch (Exception e) {
Log.error(e); Log.error(e);
return null; return Collections.emptyMap();
} }
finally { finally {
try { try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment