jon 01/06/07 18:27:46
Modified: src/java/org/apache/turbine/services/pull
TurbinePullService.java
Log:
check for null first...sometimes you can get a null value back from
data.getUser()
Revision Changes Path
1.24 +4 -3
jakarta-turbine/src/java/org/apache/turbine/services/pull/TurbinePullService.java
Index: TurbinePullService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/pull/TurbinePullService.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- TurbinePullService.java 2001/06/08 01:21:31 1.23
+++ TurbinePullService.java 2001/06/08 01:27:46 1.24
@@ -147,7 +147,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
- * @version $Id: TurbinePullService.java,v 1.23 2001/06/08 01:21:31 jon Exp $
+ * @version $Id: TurbinePullService.java,v 1.24 2001/06/08 01:27:46 jon Exp $
*/
public class TurbinePullService extends TurbineBaseService
implements PullService
@@ -418,8 +418,9 @@
// very similar, so the same method is used - the
// boolean parameter indicates whether get/setPerm is to be used
// rather than get/setTemp)
- populateWithSessionTools(sessionTools, context, data, false);
- if( data.getUser().hasLoggedIn() )
+ populateWithSessionTools(sessionTools, context, data, false);
+
+ if( data.getUser() != null && data.getUser().hasLoggedIn() )
{
populateWithSessionTools(persistentTools, context, data, true);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
