[seam-commits] Seam SVN: r10620 - branches/community/Seam_2_1/src/main/org/jboss/seam/contexts.

[seam-commits at lists.jboss.org]

Author: shane.bryzak at jboss.com
Date: 2009-04-23 18:24:58 -0400 (Thu, 23 Apr 2009)
New Revision: 10620

Modified:
   branches/community/Seam_2_1/src/main/org/jboss/seam/contexts/Lifecycle.java
Log:
reverted patch

Modified: branches/community/Seam_2_1/src/main/org/jboss/seam/contexts/Lifecycle.java
===================================================================
--- branches/community/Seam_2_1/src/main/org/jboss/seam/contexts/Lifecycle.java	2009-04-23 22:03:00 UTC (rev 10619)
+++ branches/community/Seam_2_1/src/main/org/jboss/seam/contexts/Lifecycle.java	2009-04-23 22:24:58 UTC (rev 10620)
@@ -8,14 +8,12 @@
 
 import java.util.Map;
 import java.util.Set;
-import javax.servlet.ServletContext;
 
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.core.ConversationEntries;
 import org.jboss.seam.core.Manager;
 import org.jboss.seam.log.LogProvider;
 import org.jboss.seam.log.Logging;
-import org.jboss.seam.servlet.ServletApplicationMap;
 
 /**
  * Methods for setup and teardown of Seam contexts.
@@ -177,7 +175,7 @@
       Contexts.destroyConversationContext(session, conversationId);
    }
 
-   public static void beginSession(Map<String, Object> session, ServletContext appCtx)
+   public static void beginSession(Map<String, Object> session)
    {
       log.debug("Session started");
       
@@ -189,17 +187,8 @@
       boolean conversationContextActive = Contexts.isConversationContextActive();
 
       if ( !applicationContextActive )
-      {         
-         Context tempApplicationContext = null;
-         if(appCtx == null)
-         {
-            tempApplicationContext = new ApplicationContext( getApplication() );
-         }
-         else
-         {
-            tempApplicationContext = new ApplicationContext( new ServletApplicationMap(appCtx) );
-         }                  
-         
+      {
+         Context tempApplicationContext = new ApplicationContext( getApplication() );
          Contexts.applicationContext.set(tempApplicationContext);
       }
       Context oldSessionContext = Contexts.sessionContext.get();