svn commit: r416987 - /struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/ChatSessionListener.java

[tmjee]

Author: tmjee
Date: Sat Jun 24 23:52:48 2006
New Revision: 416987

URL: http://svn.apache.org/viewvc?rev=416987&view=rev
Log:
WW-1351
  - checked for possible NPE being thrown


Modified:
    
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/ChatSessionListener.java

Modified: 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/ChatSessionListener.java
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/ChatSessionListener.java?rev=416987&r1=416986&r2=416987&view=diff
==============================================================================
--- 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/ChatSessionListener.java
 (original)
+++ 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/chat/ChatSessionListener.java
 Sat Jun 24 23:52:48 2006
@@ -38,10 +38,12 @@
                WebApplicationContext context = 
WebApplicationContextUtils.getWebApplicationContext(session.getServletContext());
                if (context != null) {
                        User user = (User) 
session.getAttribute(ChatInterceptor.CHAT_USER_SESSION_KEY);
-                       ChatService service = (ChatService) 
context.getBean("chatService");
-                       service.logout(user.getName());
-                       
-                       _log.info("session expired, logged user 
["+user.getName()+"] out");
+                       if (user != null) {
+                               ChatService service = (ChatService) 
context.getBean("chatService");
+                               service.logout(user.getName());
+                               
+                               _log.info("session expired, logged user 
["+user.getName()+"] out");
+                       }
                }
        }