Author: antelder
Date: Tue Feb 12 05:57:58 2008
New Revision: 620806
URL: http://svn.apache.org/viewvc?rev=620806&view=rev
Log:
Fix merge from 620667 change
Modified:
incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
Modified:
incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java?rev=620806&r1=620805&r2=620806&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
(original)
+++
incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
Tue Feb 12 05:57:58 2008
@@ -264,7 +264,7 @@
m = context.getClass().getMethod("getContextPath", new Class[] {});
contextPath = (String)m.invoke(context, new Object[] {});
} catch (Exception e) {
- contextPath = config.getInitParameter("contextPath");
+ contextPath = context.getInitParameter("contextPath");
if (contextPath == null) {
logger.warning("Servlet level is: " +
context.getMajorVersion() + "." + context.getMinorVersion());
throw new IllegalStateException(
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
