Author: markt
Date: Fri Nov 15 17:17:01 2013
New Revision: 1542334
URL: http://svn.apache.org/r1542334
Log:
Take account of WebResourceRoot being stricter with traversal attempts.
Modified:
tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
Modified:
tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java?rev=1542334&r1=1542333&r2=1542334&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
Fri Nov 15 17:17:01 2013
@@ -112,8 +112,15 @@ public abstract class AbstractTestResour
@Test
public final void testGetResourceTraversal() {
- WebResource webResource =
- resourceRoot.getResource(getMount() + "/../");
+ WebResource webResource = null;
+ try {
+ webResource = resourceRoot.getResource(getMount() + "/../");
+ } catch (IllegalArgumentException iae) {
+ // Expected if mount point is zero length
+ Assert.assertTrue(getMount().length() == 0);
+ return;
+ }
+
Assert.assertFalse(webResource.exists());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
