jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mreut...@apache.org
Subject svn commit: r606218 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java
Date Fri, 21 Dec 2007 15:31:58 GMT
Author: mreutegg
Date: Fri Dec 21 07:31:57 2007
New Revision: 606218

URL: http://svn.apache.org/viewvc?rev=606218&view=rev
Log:
JCR-1278: Add configuration path to SynonymProvider
- fix issue with relative path and File.mkdirs()

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java?rev=606218&r1=606217&r2=606218&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java
Fri Dec 21 07:31:57 2007
@@ -923,6 +923,7 @@
             } catch (Exception e) {
                 log.warn("Exception initializing synonym provider: " +
                         synonymProviderClass, e);
+                sp = null;
             }
         }
         return sp;
@@ -937,7 +938,7 @@
      *                             system.
      */
     protected FileSystemResource createSynonymProviderConfigResource()
-            throws FileSystemException {
+            throws FileSystemException, IOException {
         if (synonymProviderConfigPath != null) {
             FileSystemResource fsr;
             // simple sanity check
@@ -954,7 +955,7 @@
                 if (lastSeparator != -1) {
                     File root = new File(path,
                             synonymProviderConfigPath.substring(0, lastSeparator));
-                    ((LocalFileSystem) fs).setRoot(root);
+                    ((LocalFileSystem) fs).setRoot(root.getCanonicalFile());
                     fs.init();
                     fsr = new FileSystemResource(fs,
                             synonymProviderConfigPath.substring(lastSeparator + 1));



Mime
View raw message