Author: dkulp
Date: Mon May 21 14:14:15 2007
New Revision: 540300
URL: http://svn.apache.org/viewvc?view=rev&rev=540300
Log:
[CXF-667] Patch from tomeks applied. Thanks!
Modified:
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
Modified:
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java?view=diff&rev=540300&r1=540299&r2=540300
==============================================================================
---
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
(original)
+++
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
Mon May 21 14:14:15 2007
@@ -225,7 +225,9 @@
}
public void destroy() {
- childCtx.destroy();
+ if (childCtx != null) {
+ childCtx.destroy();
+ }
String s = bus.getId();
BUS_MAP.remove(s);