Author: markt Date: Mon Aug 11 09:44:10 2014 New Revision: 1617234 URL: http://svn.apache.org/r1617234 Log: Use root just created rather than new object
Modified: tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestDirResourceSet.java tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java Modified: tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestDirResourceSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestDirResourceSet.java?rev=1617234&r1=1617233&r2=1617234&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestDirResourceSet.java (original) +++ tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestDirResourceSet.java Mon Aug 11 09:44:10 2014 @@ -35,9 +35,7 @@ public abstract class AbstractTestDirRes public WebResourceRoot getWebResourceRoot() { File f = new File(getBaseDir()); TesterWebResourceRoot root = new TesterWebResourceRoot(); - WebResourceSet webResourceSet = - new DirResourceSet(new TesterWebResourceRoot(), "/", - f.getAbsolutePath(), "/"); + WebResourceSet webResourceSet = new DirResourceSet(root, "/", f.getAbsolutePath(), "/"); webResourceSet.setReadOnly(readOnly); root.setMainResources(webResourceSet); return root; Modified: tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java?rev=1617234&r1=1617233&r2=1617234&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java (original) +++ tomcat/trunk/test/org/apache/catalina/webresources/AbstractTestFileResourceSet.java Mon Aug 11 09:44:10 2014 @@ -35,9 +35,7 @@ public abstract class AbstractTestFileRe public WebResourceRoot getWebResourceRoot() { File f = new File(getBaseDir()); TesterWebResourceRoot root = new TesterWebResourceRoot(); - WebResourceSet webResourceSet = - new DirResourceSet(new TesterWebResourceRoot(), "/", - f.getAbsolutePath(), "/"); + WebResourceSet webResourceSet = new DirResourceSet(root, "/", f.getAbsolutePath(), "/"); webResourceSet.setReadOnly(readOnly); root.setMainResources(webResourceSet); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org