Re: svn commit: r356483 - /lenya/trunk/src/modules/search/java/src/org/apache/lenya/lucene/IndexConfiguration.java

[Antonio Gallardo]

[EMAIL PROTECTED] wrote:

Author: chestnut
Date: Mon Dec 12 21:50:01 2005
New Revision: 356483
URL: http://svn.apache.org/viewcvs?rev=356483&view=rev
Log:
fixes broken compilation: IndexConfiguration (Bug 37873)
Thanks to Felix Röthenbacher for the patch


Modified:
   
lenya/trunk/src/modules/search/java/src/org/apache/lenya/lucene/IndexConfiguration.java

Modified: 
lenya/trunk/src/modules/search/java/src/org/apache/lenya/lucene/IndexConfiguration.java
URL: 
http://svn.apache.org/viewcvs/lenya/trunk/src/modules/search/java/src/org/apache/lenya/lucene/IndexConfiguration.java?rev=356483&r1=356482&r2=356483&view=diff
==============================================================================
--- 
lenya/trunk/src/modules/search/java/src/org/apache/lenya/lucene/IndexConfiguration.java
 (original)
+++ 
lenya/trunk/src/modules/search/java/src/org/apache/lenya/lucene/IndexConfiguration.java
 Mon Dec 12 21:50:01 2005
@@ -20,10 +20,10 @@
import java.io.File;
import java.io.IOException;

-import org.apache.avalon.excalibur.io.FileUtil;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
+import org.apache.commons.io.FilenameUtils;
import org.apache.log4j.Logger;
import org.xml.sax.SAXException;

@@ -155,9 +155,11 @@
     * @return A string.
     */
    public String resolvePath(String path) {
-        if (path.indexOf(File.separator) == 0) {
-            return path;
+        File pathName = new File(path);
+        if (pathName.isAbsolute()) {
+            return pathName.getAbsolutePath();
+        } else {
+            return FilenameUtils.concat(this.configurationFilePath, path);
        }
-        return FileUtil.catPath(this.configurationFilePath, path);
    }
}

 

Sorry for being grumpy. ;-)

There is no need to create a "new File" inside this method. It only have 
a performance penality. Can we don just replace:

return FileUtil.catPath(this.configurationFilePath, path);

with:

return FilenameUtils.concat(this.configurationFilePath, path);

and keep the method as it was?

WDYT?

Best Regards,

Antonio Gallardo.



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]