Author: ningjiang
Date: Sun Aug 12 08:04:43 2007
New Revision: 565077
URL: http://svn.apache.org/viewvc?view=rev&rev=565077
Log:
Fixed the last commit build failed
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=565077&r1=565076&r2=565077
==============================================================================
---
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
Sun Aug 12 08:04:43 2007
@@ -142,8 +142,8 @@
.getAttribute("org.springframework.web.context.WebApplicationContext.ROOT");
if (ctxObject instanceof ApplicationContext) {
ctx = (ApplicationContext) ctxObject;
- } else {
- // it should be the runtime exception
+ } else if (ctxObject != null) {
+ // it should be the runtime exception
Exception ex = (Exception) ctxObject;
throw new ServletException(ex);
}