geronimo-scm mailing list archives

Author: djencks
Date: Tue Apr  5 07:35:34 2005
New Revision: 160176

URL: http://svn.apache.org/viewcvs?view=rev&rev=160176
Log:
GERONIMO-625 session-timeout is not required in session-config

Modified:
    geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java

Modified: geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?view=diff&r1=160175&r2=160176
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
(original)
+++ geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
Tue Apr  5 07:35:34 2005
@@ -436,7 +436,10 @@
 
             webModuleData.setAttribute("distributable", webApp.getDistributableArray().length
== 1 ? Boolean.TRUE : Boolean.FALSE);
 
-            webModuleData.setAttribute("sessionTimeoutSeconds", webApp.getSessionConfigArray().length
== 1 ? new Integer(webApp.getSessionConfigArray(0).getSessionTimeout().getBigIntegerValue().intValue()
* 60) : defaultSessionTimeoutSeconds);
+            webModuleData.setAttribute("sessionTimeoutSeconds",
+                    (webApp.getSessionConfigArray().length == 1 && webApp.getSessionConfigArray(0).getSessionTimeout()
!= null) ?
+                    new Integer(webApp.getSessionConfigArray(0).getSessionTimeout().getBigIntegerValue().intValue()
* 60) :
+                    defaultSessionTimeoutSeconds);
 
             MimeMappingType[] mimeMappingArray = webApp.getMimeMappingArray();
             Map mimeMappingMap = new HashMap();
@@ -1176,7 +1179,7 @@
                 } else if (tokens[1].equals("CONFIDENTIAL")) {
                     this.transportType = CONFIDENTIAL;
                 }
-            } 
+            }
         }
     }