Author: vgritsenko
Date: Tue Mar 13 20:21:58 2007
New Revision: 517983
URL: http://svn.apache.org/viewvc?view=rev&rev=517983
Log:
<action dev="VG" type="fix" fixes-bug="33148" due-to="Natalia
Shilenkova">
Ensure that background indexing processes are complete before
shutting database down.
</action>
Modified:
xml/xindice/trunk/java/src/org/apache/xindice/core/indexer/IndexManager.java
xml/xindice/trunk/status.xml
Modified:
xml/xindice/trunk/java/src/org/apache/xindice/core/indexer/IndexManager.java
URL:
http://svn.apache.org/viewvc/xml/xindice/trunk/java/src/org/apache/xindice/core/indexer/IndexManager.java?view=diff&rev=517983&r1=517982&r2=517983
==============================================================================
---
xml/xindice/trunk/java/src/org/apache/xindice/core/indexer/IndexManager.java
(original)
+++
xml/xindice/trunk/java/src/org/apache/xindice/core/indexer/IndexManager.java
Tue Mar 13 20:21:58 2007
@@ -255,6 +255,9 @@
IndexerInfo info = new IndexerInfo(name, style, pattern, idx);
if (!idx.exists()) {
+ idx.create();
+ idx.open();
+
info.status = STATUS_BUSY;
synchronized (newIndexers) {
newIndexers.add(info);
@@ -334,27 +337,12 @@
}
Stopwatch sw = new Stopwatch("Populated Indexes", true);
- for (int i = 0; i < list.length; i++) {
- try {
- if (!list[i].indexer.exists()) {
- list[i].indexer.create();
- }
-
- list[i].indexer.open();
- } catch (Exception e) {
- if (log.isWarnEnabled()) {
- log.warn("Failed to create/open indexer " + list[i],
e);
- }
- }
- }
-
RecordSet rs = collection.getFiler().getRecordSet();
while (rs.hasMoreRecords()) {
// Read only key, we don't need filer-level value
Key key = rs.getNextKey();
Object value = collection.getEntry(key);
if (value instanceof Document) {
- // Document doc = new
DocumentImpl(rec.getValue().getData(), symbols, new NodeSource(collection,
key));
try {
new SAXHandler(key, (Document)value, ACTION_CREATE,
list);
} catch (Exception e) {
Modified: xml/xindice/trunk/status.xml
URL:
http://svn.apache.org/viewvc/xml/xindice/trunk/status.xml?view=diff&rev=517983&r1=517982&r2=517983
==============================================================================
--- xml/xindice/trunk/status.xml (original)
+++ xml/xindice/trunk/status.xml Tue Mar 13 20:21:58 2007
@@ -28,7 +28,7 @@
<developers>
<person name="Vladimir Ritz Bossicard" email="[EMAIL PROTECTED]"
id="VBO"/>
<person name="Vadim Gritsenko" email="[EMAIL PROTECTED]" id="VG"/>
- <person name="Todd Byrne" email="[EMAIL PROTECTED]" id="TB"/>
+ <person name="Todd Byrne" email="[EMAIL PROTECTED]" id="TB"/>
</developers>
<todo>
<actions priority="Long Term">
@@ -118,6 +118,10 @@
<changes>
<release version="1.1b5-dev" date="Mar 1 2007">
+ <action dev="VG" type="fix" fixes-bug="33148" due-to="Natalia
Shilenkova">
+ Ensure that background indexing processes are complete before
+ shutting database down.
+ </action>
<action dev="VG" type="fix" fixes-bug="41710" due-to="Natalia
Shilenkova">
Ensure that background indexing processes are complete before
shutting database down.
