Author: gmazza
Date: Sun Oct 5 10:10:50 2008
New Revision: 701830
URL:
http://svn.apache.org/viewvc?rev=701830&view=revLog:
Comment added on how ApplicationContext is made available to CXFServlet.
Modified:
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java?rev=701830&r1=701829&r2=701830&view=diff==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java Sun Oct 5 10:10:50 2008
@@ -92,7 +92,7 @@
if (ctxObject instanceof ApplicationContext) {
ctx = (ApplicationContext) ctxObject;
} else if (ctxObject != null) {
- // it should be the runtime exception
+ // it should be a runtime exception
Exception ex = (Exception) ctxObject;
throw new ServletException(ex);
}
@@ -105,8 +105,13 @@
}
}
private void updateContext(ServletConfig servletConfig, ApplicationContext ctx) {
- // This constructor works whether there is a context or not
- // If the ctx is null, we just start up the default bus
+ /* If ctx is null, normally no ContextLoaderListener
+ * was defined in web.xml. Default bus with all extensions
+ * will be created in this case.
+ *
+ * If ctx not null, was already created by ContextLoaderListener.
+ * Bus with only those extensions defined in the ctx will be created.
+ */
if (ctx == null) {
LOG.info("LOAD_BUS_WITHOUT_APPLICATION_CONTEXT");
bus = new SpringBusFactory().createBus();