Author: rwesten
Date: Fri Oct 9 07:02:09 2015
New Revision: 1707665
URL: http://svn.apache.org/viewvc?rev=1707665&view=rev
Log:
fix for STANBOL-1442
Modified:
stanbol/branches/release-0.12/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
stanbol/branches/release-0.12/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngineComponent.java
Modified:
stanbol/branches/release-0.12/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java?rev=1707665&r1=1707664&r2=1707665&view=diff
==============================================================================
---
stanbol/branches/release-0.12/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
(original)
+++
stanbol/branches/release-0.12/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
Fri Oct 9 07:02:09 2015
@@ -184,7 +184,7 @@ public class SolrServerAdapter {
try {
updateServerRegistration();
} catch (IllegalStateException e) {
- log.debug("Server Registration already unregistered ",e);
+ log.debug("Not updating Server Registration (already
unregistered)");
}
}
Modified:
stanbol/branches/release-0.12/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngineComponent.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngineComponent.java?rev=1707665&r1=1707664&r2=1707665&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngineComponent.java
(original)
+++
stanbol/branches/release-0.12/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngineComponent.java
Fri Oct 9 07:02:09 2015
@@ -665,7 +665,7 @@ public class FstLinkingEngineComponent {
public void removedService(ServiceReference reference, Object
service) {
log.info(" ... SolrCore for {} was removed!", reference);
//try to get an other serviceReference from the tracker
-
if(reference.equals(FstLinkingEngineComponent.this.indexReference)){
+
if(reference.equals(FstLinkingEngineComponent.this.solrServerReference)){
updateEngineRegistration(solrServerTracker.getServiceReference(), null);
} else {
log.info(" - removed SolrCore was not used for FST
linking");