Extend validity bugfix

Author: malaqueueit

QueueIT.Security.Examples/nbproject/private/private.xml

@@ -3,7 +3,9 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
+            <file>file:/C:/GIT/QueueIT.Security-JavaEE/QueueIT.Security.Examples/web/simple.jsp</file>
             <file>file:/C:/GIT/QueueIT.Security-JavaEE/QueueIT.Security.Examples/web/index.jsp</file>
+            <file>file:/C:/GIT/QueueIT.Security-JavaEE/QueueIT.Security.Examples/web/WEB-INF/classes/queueit.properties</file>
         </group>
     </open-files>
 </project-private>

QueueIT.Security/nbproject/private/private.xml

@@ -4,9 +4,12 @@
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
             <file>file:/C:/GIT/QueueIT.Security-JavaEE/QueueIT.Security/nbproject/build-impl.xml</file>
+            <file>file:/C:/GIT/QueueIT.Security-JavaEE/QueueIT.Security/src/queueit/security/Queue.java</file>
             <file>file:/C:/GIT/QueueIT.Security-JavaEE/QueueIT.Security/test/queueit/security/DefaultKnownUserUrlProviderTest.java</file>
             <file>file:/C:/GIT/QueueIT.Security-JavaEE/QueueIT.Security/src/queueit/security/CookieValidateResultRepository.java</file>
             <file>file:/C:/GIT/QueueIT.Security-JavaEE/QueueIT.Security/src/queueit/security/DefaultKnownUserUrlProvider.java</file>
+            <file>file:/C:/GIT/QueueIT.Security-JavaEE/QueueIT.Security/src/queueit/security/SessionValidateResultRepository.java</file>
+            <file>file:/C:/GIT/QueueIT.Security-JavaEE/QueueIT.Security/src/queueit/security/SessionValidationController.java</file>
         </group>
     </open-files>
 </project-private>

QueueIT.Security/src/queueit/security/SessionValidateResultRepository.java

@@ -70,14 +70,6 @@ public void setValidationResult(IQueue queue, IValidateResult validationResult,
 
         if (validationResult instanceof AcceptedConfirmedResult)
         {
-            if (defaultExtendValidity == false && expirationTime == null) 
-            {
-                HttpServletRequest request = RequestContext.getCurrentInstance().getRequest();
-                HttpSession session = request.getSession(true);
-        
-                expirationTime = new Date(System.currentTimeMillis()+(session.getMaxInactiveInterval()*1000));
-            }
-            
             AcceptedConfirmedResult confirmedResult = (AcceptedConfirmedResult)validationResult;
 
             HttpServletRequest request = RequestContext.getCurrentInstance().getRequest();
@@ -96,6 +88,8 @@ public void setValidationResult(IQueue queue, IValidateResult validationResult,
                 model.Expiration = expirationTime;
             else if (confirmedResult.getKnownUser().getRedirectType() == RedirectType.Idle)
                 model.Expiration = new Date(System.currentTimeMillis()+(defaultIdleExpiration*1000));
+            else if (defaultExtendValidity == false )      
+                model.Expiration = new Date(System.currentTimeMillis()+(session.getMaxInactiveInterval()*1000));
 
             session.setAttribute(key, model);
         }