tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r967073 - /tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
Date Fri, 23 Jul 2010 12:37:45 GMT
Author: markt
Date: Fri Jul 23 12:37:45 2010
New Revision: 967073

URL: http://svn.apache.org/viewvc?rev=967073&view=rev
Log:
Fix the paths used for JAR resources

Modified:
    tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java

Modified: tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java?rev=967073&r1=967072&r2=967073&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java Fri Jul 23 12:37:45
2010
@@ -408,7 +408,7 @@ public abstract class BaseDirContext imp
         for (DirContext altDirContext : altDirContexts) {
             if (altDirContext instanceof BaseDirContext){
                 path = ((BaseDirContext) altDirContext).getRealPath(
-                        "META-INF/resources/" + name);
+                        "/META-INF/resources" + name);
                 if (path != null)
                     return path;
             }
@@ -462,7 +462,7 @@ public abstract class BaseDirContext imp
         // Check the alternate locations
         for (DirContext altDirContext : altDirContexts) {
             try {
-                obj = altDirContext.lookup("META-INF/resources/" + name);
+                obj = altDirContext.lookup("/META-INF/resources" + name);
                 if (obj != null)
                     return obj;
             } catch ( NamingException ex) {
@@ -686,7 +686,7 @@ public abstract class BaseDirContext imp
         for (DirContext altDirContext : altDirContexts) {
             if (altDirContext instanceof BaseDirContext)
                 bindings = ((BaseDirContext) altDirContext).doListBindings(
-                        "META-INF/resources/" + name);
+                        "/META-INF/resources" + name);
             else {
                 try {
                     bindings = altDirContext.listBindings(name);
@@ -1043,7 +1043,7 @@ public abstract class BaseDirContext imp
         for (DirContext altDirContext : altDirContexts) {
             if (altDirContext instanceof BaseDirContext)
                 attrs = ((BaseDirContext) altDirContext).doGetAttributes(
-                        "META-INF/resources/" + name, attrIds);
+                        "/META-INF/resources" + name, attrIds);
             else {
                 try {
                     attrs = altDirContext.getAttributes(name, attrIds);



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message