svn commit: r1626689 - /tomee/tomee/branches/tomee-1.7.x/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

[rmannibucau]

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

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

Modified:
    
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

Modified: 
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1626689&r1=1626688&r2=1626689&view=diff
==============================================================================
--- 
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 (original)
+++ 
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 Mon Sep 22 08:13:14 2014
@@ -849,8 +849,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();