Author: ggregory Date: Tue Jul 3 20:38:40 2012 New Revision: 1356923 URL: http://svn.apache.org/viewvc?rev=1356923&view=rev Log: [VFS-426] HTTP URL query string not part of cache key
Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpFilesCacheTestCase.java commons/proper/vfs/trunk/src/changes/changes.xml Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java?rev=1356923&r1=1356922&r2=1356923&view=diff ============================================================================== --- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java (original) +++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java Tue Jul 3 20:38:40 2012 @@ -255,7 +255,7 @@ public abstract class AbstractFileName i { if (key == null) { - key = createURI(true, true); + key = getURI(); } return key; } Modified: commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpFilesCacheTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpFilesCacheTestCase.java?rev=1356923&r1=1356922&r2=1356923&view=diff ============================================================================== --- commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpFilesCacheTestCase.java (original) +++ commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpFilesCacheTestCase.java Tue Jul 3 20:38:40 2012 @@ -50,9 +50,9 @@ public class HttpFilesCacheTestCase exte Assert.assertEquals(noQueryStringUrl, noQueryFile.getURL().toExternalForm()); final FileObject queryFile = fileSystemManager.resolveFile(queryStringUrl); - // Assert.assertEquals(queryStringUrl, queryFile.getURL().toExternalForm()); // fails for VFS-426 + Assert.assertEquals(queryStringUrl, queryFile.getURL().toExternalForm()); // failed for VFS-426 final FileObject queryFile2 = fileSystemManager.resolveFile(queryStringUrl2); - // Assert.assertEquals(queryStringUrl2, queryFile2.getURL().toExternalForm()); // fails for VFS-426 + Assert.assertEquals(queryStringUrl2, queryFile2.getURL().toExternalForm()); // failed for VFS-426 } } Modified: commons/proper/vfs/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/changes/changes.xml?rev=1356923&r1=1356922&r2=1356923&view=diff ============================================================================== --- commons/proper/vfs/trunk/src/changes/changes.xml (original) +++ commons/proper/vfs/trunk/src/changes/changes.xml Tue Jul 3 20:38:40 2012 @@ -23,6 +23,9 @@ <body> <release version="2.1" date="TBD" description="New features and bug fix release."> + <action issue="VFS-426" dev="ggregory" type="add" due-to="daniel.bergholm"> + HTTP URL query string not part of cache key. + </action> <action issue="VFS-425" dev="ggregory" type="add" due-to="ggregory"> Add API FileObject.isExecutable(). </action>