geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r902387 - /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
Date Sat, 23 Jan 2010 11:32:38 GMT
Author: xuhaihong
Date: Sat Jan 23 11:32:37 2010
New Revision: 902387

URL: http://svn.apache.org/viewvc?rev=902387&view=rev
Log:
Latest Tomcat 7 removed the getState method

Modified:
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java?rev=902387&r1=902386&r2=902387&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
Sat Jan 23 11:32:37 2010
@@ -51,18 +51,15 @@
 import org.apache.geronimo.tomcat.interceptor.BeforeAfter;
 import org.apache.geronimo.tomcat.interceptor.ComponentContextBeforeAfter;
 import org.apache.geronimo.tomcat.interceptor.InstanceContextBeforeAfter;
-import org.apache.geronimo.tomcat.interceptor.PolicyContextBeforeAfter;
 import org.apache.geronimo.tomcat.interceptor.UserTransactionBeforeAfter;
 import org.apache.geronimo.tomcat.listener.DispatchListener;
 import org.apache.geronimo.tomcat.listener.RunAsInstanceListener;
 import org.apache.geronimo.tomcat.util.SecurityHolder;
-import org.apache.geronimo.tomcat.valve.DefaultSubjectValve;
 import org.apache.geronimo.tomcat.valve.GeronimoBeforeAfterValve;
 import org.apache.geronimo.webservices.POJOWebServiceServlet;
 import org.apache.geronimo.webservices.WebServiceContainer;
 import org.apache.geronimo.webservices.WebServiceContainerInvoker;
 import org.apache.tomcat.InstanceManager;
-import org.osgi.framework.Bundle;
 
 
 /**
@@ -122,7 +119,7 @@
             if (tctx.getSecurityHolder() != null) {
                 configurationFactory = tctx.getSecurityHolder().getConfigurationFactory();
             }
-            
+
             getServletContext().setAttribute(InstanceManager.class.getName(), ctx.getInstanceManager());
         }
 
@@ -486,7 +483,7 @@
                 } catch (LifecycleException e) {
                     throw (IOException) new IOException("wrapping lifecycle exception").initCause(e);
                 }
-                if (GeronimoStandardContext.this.getState() != 1 || !GeronimoStandardContext.this.getAvailable()){
+                if (!GeronimoStandardContext.this.getAvailable()) {
                     throw new IOException("Context did not start for an unknown reason");
                 }
             } else {



Mime
View raw message