[JM-1281] Fixed an exception using a user with a not visible email and CS as a provider.

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

openfire_3_5_0/src/java/org/jivesoftware/openfire/user/UserNameManager.java

@@ -95,9 +95,8 @@ public class UserNameManager {
         if (server.isLocal(entity)) {
             // Contact is a local entity so search for his user name
             User localUser = UserManager.getInstance().getUser(entity.getNode());
-            return "".equals(localUser.getName()) ? entity.getNode() : localUser.getName();
-        }
-        else {
+            return !localUser.isNameVisible() || "".equals(localUser.getName()) ? entity.getNode() : localUser.getName();
+        } else {
             UserNameProvider provider = providersByDomain.get(entity.getDomain());
             if (provider != null) {
                 return provider.getUserName(entity);