Author: joachim
Date: Sat Oct 21 00:49:00 2006
New Revision: 466362
URL: http://svn.apache.org/viewvc?view=rev&rev=466362
Log:
Added fix for NPE mentioned in JAMES-284. The User object in session can be
null.
However the affected code seems to be unreachable. Added TODO for further
investigations.
Thanks to Adam Fowler for reporting.
Modified:
james/server/trunk/src/java/org/apache/james/imapserver/ImapHandler.java
Modified:
james/server/trunk/src/java/org/apache/james/imapserver/ImapHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/imapserver/ImapHandler.java?view=diff&rev=466362&r1=466361&r2=466362
==============================================================================
--- james/server/trunk/src/java/org/apache/james/imapserver/ImapHandler.java
(original)
+++ james/server/trunk/src/java/org/apache/james/imapserver/ImapHandler.java
Sat Oct 21 00:49:00 2006
@@ -37,6 +37,7 @@
import org.apache.james.Constants;
import org.apache.james.imapserver.debug.CopyInputStream;
import org.apache.james.imapserver.debug.SplitOutputStream;
+import org.apache.james.services.User;
import org.apache.james.util.InternetPrintWriter;
import org.apache.james.util.watchdog.Watchdog;
import org.apache.james.util.watchdog.WatchdogTarget;
@@ -238,15 +239,21 @@
}
theWatchdog.reset();
}
+ // TODO is this unreachable code because of !handlerIsUp -> return?
theWatchdog.stop();
//Write BYE message.
if ( getLogger().isInfoEnabled() ) {
+ String user = "<unknown>";
+ User userObject = session.getUser();
+ if (userObject != null) {
+ user = userObject.getUserName();
+ }
StringBuffer logBuffer =
new StringBuffer( 128 )
.append( "Connection for " )
- .append( session.getUser().getUserName() )
+ .append( user )
.append( " from " )
.append( remoteHost )
.append( " (" )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
