Fixed NPE when a client used uppercase letters in the username. JM-124

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

src/java/org/jivesoftware/messenger/SessionManager.java

@@ -353,8 +353,7 @@ public class SessionManager extends BasicModule implements ConnectionCloseListen
             // A non-anonymous session is now available
             Session defaultSession = null;
             try {
-                String username = session.getUsername().toLowerCase();
-                defaultSession = sessions.get(username).getDefaultSession(true);
+                defaultSession = sessions.get(session.getUsername()).getDefaultSession(true);
                 JID node = new JID(defaultSession.getAddress().getNode(),
                         defaultSession.getAddress().getDomain(), null);
                 // Add route to default session (used when no resource is specified)
@@ -384,8 +383,11 @@ public class SessionManager extends BasicModule implements ConnectionCloseListen
             // Remove route to the removed session (anonymous or not)
             routingTable.removeRoute(session.getAddress());
             try {
-                String username = session.getUsername().toLowerCase();
-                SessionMap sessionMap = sessions.get(username);
+                if (session.getUsername() == null) {
+                    // Do nothing since this is an anonymous session
+                    return;
+                }
+                SessionMap sessionMap = sessions.get(session.getUsername());
                 // If sessionMap is null, which is an irregular case, try to clean up the routes to
                 // the user from the routing table
                 if (sessionMap == null) {

src/java/org/jivesoftware/messenger/spi/SessionImpl.java

@@ -96,7 +96,7 @@ public class SessionImpl implements Session {
         if (authToken == null) {
             throw new UserNotFoundException();
         }
-        return authToken.getUsername();
+        return address.getNode();
     }
 
     public String getServerName() {