You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2005/03/15 23:02:57 UTC
cvs commit: ws-axis/java/src/org/apache/axis/transport/http AxisServletBase.java
dims 2005/03/15 14:02:57
Modified: java/src/org/apache/axis/transport/http AxisServletBase.java
Log:
Fix for AXIS-1867 - Exception thrown in Tomcat 5.5.7 in AxisServletBase
from Alexandre ROMAN
URL: http://issues.apache.org/jira/browse/AXIS-1867
Revision Changes Path
1.29 +2 -2 ws-axis/java/src/org/apache/axis/transport/http/AxisServletBase.java
Index: AxisServletBase.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/transport/http/AxisServletBase.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- AxisServletBase.java 9 Dec 2004 17:09:43 -0000 1.28
+++ AxisServletBase.java 15 Mar 2005 22:02:57 -0000 1.29
@@ -209,7 +209,7 @@
AxisServer server = (AxisServer) context.getAttribute(ATTR_AXIS_ENGINE);
// no other AxisEngine in ServletContext
- if (servlet.getServletName().equals(server.getName())) {
+ if (server != null && servlet.getServletName().equals(server.getName())) {
context.removeAttribute(ATTR_AXIS_ENGINE);
}
} else {
@@ -241,7 +241,7 @@
if (contextObject instanceof AxisServer) {
AxisServer server = (AxisServer) contextObject;
// if this is "our" Engine
- if (servlet.getServletName().equals(server.getName())) {
+ if (server != null && servlet.getServletName().equals(server.getName())) {
return server;
}
return null;