You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2006/12/15 22:22:24 UTC
svn commit: r487669 -
/geronimo/server/branches/2.0-M1/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyContainerImpl.java
Author: jbohn
Date: Fri Dec 15 13:22:23 2006
New Revision: 487669
URL: http://svn.apache.org/viewvc?view=rev&rev=487669
Log:
GERONIMO-2654 Fix context processing in Jetty6
- believe it or not these few lines represent the collective net changes for this issue in trunk from gregw, djencks, and dims in revs. 486863, 487412, 487426, 487428, 487486, 487489, and 487617 ... thanks guys!
Modified:
geronimo/server/branches/2.0-M1/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyContainerImpl.java
Modified: geronimo/server/branches/2.0-M1/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyContainerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0-M1/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyContainerImpl.java?view=diff&rev=487669&r1=487668&r2=487669
==============================================================================
--- geronimo/server/branches/2.0-M1/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyContainerImpl.java (original)
+++ geronimo/server/branches/2.0-M1/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyContainerImpl.java Fri Dec 15 13:22:23 2006
@@ -74,6 +74,7 @@
handlers[0] = contextHandlerCollection;
handlers[1] = defaultHandler;
handlers[2] = requestLogHandler;
+ handlerCollection.setHandlers(handlers);
server.setHandler(handlerCollection);
stats = new JettyWebContainerStatsImpl();
@@ -179,11 +180,11 @@
}
public void addContext(ContextHandler context) {
- server.addHandler(context);
+ contextHandlerCollection.addHandler(context);
}
public void removeContext(ContextHandler context) {
- server.removeHandler(context);
+ contextHandlerCollection.removeHandler(context);
}
public InternalJAASJettyRealm addRealm(String realmName) {