[jboss-cvs] JBossAS SVN: r58978 - trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers

[jboss-cvs-commits at lists.jboss.org]

Author: remy.maucherat at jboss.com
Date: 2006-12-11 15:34:58 -0500 (Mon, 11 Dec 2006)
New Revision: 58978

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/JBossContextConfig.java
Log:
- Session config was already parsed.

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/JBossContextConfig.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/JBossContextConfig.java	2006-12-11 20:13:05 UTC (rev 58977)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/JBossContextConfig.java	2006-12-11 20:34:58 UTC (rev 58978)
@@ -41,6 +41,7 @@
 import org.jboss.metadata.web.ParamValue;
 import org.jboss.metadata.web.Servlet;
 import org.jboss.metadata.web.ServletMapping;
+import org.jboss.metadata.web.SessionConfig;
 
 public class JBossContextConfig extends ContextConfig {
 
@@ -245,8 +246,13 @@
       }
 
       // Session timeout
-      if (metaData.getSessionTimeout() > 0) {
-         context.setSessionTimeout(metaData.getSessionTimeout());
+      Iterator iterator14 = metaData.getSessionConfigs().iterator();
+      if (iterator14.hasNext()) {
+         SessionConfig value = (SessionConfig) iterator14.next();
+         if (value.getSessionTimeout() != null) {
+            int i = Integer.decode(value.getSessionTimeout());
+            context.setSessionTimeout(i);
+         }
       }
         
 	}