tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1428062 - in /tomcat/tc7.0.x/trunk: java/org/apache/naming/resources/DirContextURLConnection.java webapps/docs/changelog.xml
Date Wed, 02 Jan 2013 21:26:59 GMT
Author: markt
Date: Wed Jan  2 21:26:59 2013
New Revision: 1428062

URL: http://svn.apache.org/viewvc?rev=1428062&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54249
Ensure resource properties are available when the context path contains encoded characters
such as a space. This triggered compilation issues in Jasper.

Modified:
    tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/DirContextURLConnection.java?rev=1428062&r1=1428061&r2=1428062&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/DirContextURLConnection.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/DirContextURLConnection.java Wed
Jan  2 21:26:59 2013
@@ -141,7 +141,7 @@ public class DirContextURLConnection ext
             
             try {
                 date = System.currentTimeMillis();
-                String path = getURL().getFile();
+                String path = URL_DECODER.convert(getURL().getFile(), false);
                 if (context instanceof ProxyDirContext) {
                     ProxyDirContext proxyDirContext = 
                         (ProxyDirContext) context;
@@ -159,7 +159,6 @@ public class DirContextURLConnection ext
                         path = path.substring(contextPath.length());
                     }
                 }
-                path = URL_DECODER.convert(path, false);
                 object = context.lookup(path);
                 attributes = context.getAttributes(path);
                 if (object instanceof Resource)

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1428062&r1=1428061&r2=1428062&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jan  2 21:26:59 2013
@@ -60,6 +60,11 @@
         <bug>54247</bug>: Prevent <code>ClassNotFoundException</code>s
on stop
         when running as a service. (markt)
       </fix>
+      <fix>
+        <bug>54249</bug>: Ensure resource properties are available when the
+        context path contains encoded characters such as a space. This triggered
+        compilation issues in Jasper. Patch provided by Polina Genova. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">



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


Mime
View raw message