You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2010/11/05 22:08:09 UTC
svn commit: r1031795 - in /tomcat/trunk/java/org/apache/naming/resources:
DirContextURLConnection.java ProxyDirContext.java
Author: markt
Date: Fri Nov 5 21:08:09 2010
New Revision: 1031795
URL: http://svn.apache.org/viewvc?rev=1031795&view=rev
Log:
Parallel deployment
Additional Context.get[Name|Path]() clean up
Modified:
tomcat/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java
Modified: tomcat/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/DirContextURLConnection.java?rev=1031795&r1=1031794&r2=1031795&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/DirContextURLConnection.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/DirContextURLConnection.java Fri Nov 5 21:08:09 2010
@@ -140,17 +140,17 @@ public class DirContextURLConnection
ProxyDirContext proxyDirContext =
(ProxyDirContext) context;
String hostName = proxyDirContext.getHostName();
- String contextName = proxyDirContext.getContextName();
+ String contextPath = proxyDirContext.getContextPath();
if (hostName != null) {
if (!path.startsWith("/" + hostName + "/"))
return;
path = path.substring(hostName.length()+ 1);
}
- if (contextName != null) {
- if (!path.startsWith(contextName + "/")) {
+ if (contextPath != null) {
+ if (!path.startsWith(contextPath + "/")) {
return;
}
- path = path.substring(contextName.length());
+ path = path.substring(contextPath.length());
}
}
object = context.lookup(path);
@@ -432,7 +432,7 @@ public class DirContextURLConnection
// Strip off the hostname and the contextpath
int start;
if(context instanceof ProxyDirContext &&
- "".equals(((ProxyDirContext)context).getContextName())){
+ "".equals(((ProxyDirContext)context).getContextPath())){
start = file.indexOf('/',1);
}
else
Modified: tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java?rev=1031795&r1=1031794&r2=1031795&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java Fri Nov 5 21:08:09 2010
@@ -97,6 +97,12 @@ public class ProxyDirContext implements
}
hostName = env.get(HOST);
contextName = env.get(CONTEXT);
+ int i = contextName.indexOf('#');
+ if (i == -1) {
+ contextPath = contextName;
+ } else {
+ contextPath = contextName.substring(0, i);
+ }
}
@@ -147,6 +153,12 @@ public class ProxyDirContext implements
/**
+ * Context path.
+ */
+ protected String contextPath;
+
+
+ /**
* Cache class.
*/
protected String cacheClassName =
@@ -223,6 +235,14 @@ public class ProxyDirContext implements
}
+ /**
+ * Return the context path.
+ */
+ public String getContextPath() {
+ return this.contextPath;
+ }
+
+
// -------------------------------------------------------- Context Methods
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org