Author: rwesten
Date: Wed Jan 18 18:04:47 2012
New Revision: 1232979
URL: http://svn.apache.org/viewvc?rev=1232979&view=rev
Log:
Fix for STANBOL-465
Modified:
incubator/stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java
Modified:
incubator/stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java?rev=1232979&r1=1232978&r2=1232979&view=diff
==============================================================================
---
incubator/stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java
(original)
+++
incubator/stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java
Wed Jan 18 18:04:47 2012
@@ -331,8 +331,8 @@ public class ManagedSolrServerImpl imple
metadata.setError(e);
log.error("Unable to activate previously active SolrIndex
'"+
metadata.getIndexReference()+"'!",e);
- } finally {
- managedCores.store(metadata);
+ //} finally { The metadata are not modified anyway!
+ // managedCores.store(metadata);
}
}
}
@@ -936,7 +936,7 @@ public class ManagedSolrServerImpl imple
*/
public void addTracking(IndexMetadata metadata) {
if(metadata != null){ //may be removed in the meantime
- if(!metadata.isActive() || metadata.isSynchronized()){
+ if(!(metadata.isActive() || metadata.isInactive()) ||
metadata.isSynchronized()){
String archive = metadata.getArchive();
boolean found = false; //only track higher priority files
as the current
for(String indexArchive : metadata.getIndexArchives()){
@@ -948,7 +948,7 @@ public class ManagedSolrServerImpl imple
IndexMetadata.toStringMap(metadata));
} // else higher priority archive present -> no
tracking
}
- } //else active and not syncronized -> no tracking
+ } //else (active || inactive) and not syncronized -> no
tracking
}
};
/**
