Author: ate
Date: Thu Aug 25 05:24:00 2005
New Revision: 240056

URL: http://svn.apache.org/viewcvs?rev=240056&view=rev
Log:
Fix NPE when PasswordCredential.ExpirationDate isn't set (using different 
InternalPasswordCredentialInterceptor)

Modified:
    
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/security/impl/PasswordCredentialValveImpl.java

Modified: 
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/security/impl/PasswordCredentialValveImpl.java
URL: 
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/security/impl/PasswordCredentialValveImpl.java?rev=240056&r1=240055&r2=240056&view=diff
==============================================================================
--- 
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/security/impl/PasswordCredentialValveImpl.java
 (original)
+++ 
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/security/impl/PasswordCredentialValveImpl.java
 Thu Aug 25 05:24:00 2005
@@ -85,7 +85,8 @@
                     if ( request.getSessionAttribute(CHECKED_KEY) == null  )
                     {
                         request.setSessionAttribute(CHECKED_KEY,Boolean.TRUE);
-                        if ( pwdCredential.getPreviousAuthenticationDate() != 
null )
+                        if ( pwdCredential.getPreviousAuthenticationDate() != 
null && 
+                                pwdCredential.getExpirationDate() != null )
                         {
                             long expirationTime = 
pwdCredential.getExpirationDate().getTime();
                             long lastAuthTime = 
pwdCredential.getLastAuthenticationDate().getTime();



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to