You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tomee.apache.org by rm...@apache.org on 2014/09/22 10:13:22 UTC

svn commit: r1626690 - /tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

Author: rmannibucau
Date: Mon Sep 22 08:13:22 2014
New Revision: 1626690

URL: http://svn.apache.org/r1626690
Log:
TOMEE-1357 don't force StandardManager

Modified:
    tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1626690&r1=1626689&r2=1626690&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java Mon Sep 22 08:13:22 2014
@@ -787,8 +787,6 @@ public class TomcatWebAppBuilder impleme
             } catch (final Exception e) {
                 logger.error("can't instantiate '" + sessionManager + "', StandardManager will be used", e);
             }
-        } else if (standardContext.getCluster() == null) { // else let it use the cluster to create the manager
-            standardContext.setManager(new StandardManager());
         }
 
         final LifecycleListener[] listeners = standardContext.findLifecycleListeners();