jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mreut...@apache.org
Subject svn commit: rev 55614 - incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/config
Date Tue, 26 Oct 2004 15:44:10 GMT
Author: mreutegg
Date: Tue Oct 26 08:44:08 2004
New Revision: 55614

Modified:
   incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/config/WorkspaceConfig.java
Log:
JIRA issue JCR-13
- changed WorkspaceConfig to make SearchIndex optional again.

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/config/WorkspaceConfig.java
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/config/WorkspaceConfig.java
(original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/config/WorkspaceConfig.java
Tue Oct 26 08:44:08 2004
@@ -121,7 +121,13 @@
         wspFS = createFileSystem(fsConfig, vars);
 
         // search index directory
-        searchIndexDir = replaceVars(wspElem.getChild(SEARCH_INDEX_ELEMENT).getAttributeValue(PATH_ATTRIB),
vars);
+        Element searchConfig = wspElem.getChild(SEARCH_INDEX_ELEMENT);
+        if (searchConfig != null) {
+            String pathAttr = searchConfig.getAttributeValue(PATH_ATTRIB);
+            if (pathAttr != null && pathAttr.length() > 0) {
+                searchIndexDir = replaceVars(pathAttr, vars);
+            }
+        }
 
         // persistence manager
         String className = wspElem.getChild(PERSISTENCE_MANAGER_ELEMENT).getAttributeValue(CLASS_ATTRIB);

Mime
View raw message