You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by mo...@apache.org on 2003/06/19 21:29:48 UTC
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/om/security BaseJetspeedUser.java
morciuch 2003/06/19 12:29:47
Modified: src/java/org/apache/jetspeed/om/security
BaseJetspeedUser.java
Log:
Applied Jeremy Ford's patch correcting the getAccessCounter() NPE exception (see Bugzilla bug# 20661).
Revision Changes Path
1.8 +18 -7 jakarta-jetspeed/src/java/org/apache/jetspeed/om/security/BaseJetspeedUser.java
Index: BaseJetspeedUser.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/security/BaseJetspeedUser.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BaseJetspeedUser.java 7 May 2003 15:16:48 -0000 1.7
+++ BaseJetspeedUser.java 19 Jun 2003 19:29:47 -0000 1.8
@@ -151,15 +151,21 @@
*/
public int getAccessCounterForSession()
{
+ int accessCounter = 0;
try
{
- return ((Integer) getTemp(User.SESSION_ACCESS_COUNTER)).intValue();
+ Integer temp = (Integer) getTemp(User.SESSION_ACCESS_COUNTER);
+ if(temp != null)
+ {
+ accessCounter = temp.intValue();
+ }
}
catch (Exception e)
{
- Log.error("getAccessCounterForSession(): " + e.getMessage(), e);
- return 0;
+ Log.debug("getAccessCounterForSession(): " + e.getMessage(), e);
}
+
+ return accessCounter;
}
/**
@@ -169,15 +175,20 @@
*/
public int getAccessCounter()
{
+ int accessCounter = 0;
try
{
- return ((Integer) getPerm(User.ACCESS_COUNTER)).intValue();
+ Integer temp = (Integer) getPerm(User.ACCESS_COUNTER);
+ if(temp != null)
+ {
+ accessCounter = temp.intValue();
+ }
}
catch (Exception e)
{
- Log.error("getAccessCounter(): " + e.getMessage(), e);
- return 0;
+ Log.debug("getAccessCounter(): " + e.getMessage(), e);
}
+ return accessCounter;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org