svn commit: r1707666 - in /stanbol/trunk: commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/ enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/

[rwesten]

Author: rwesten
Date: Fri Oct  9 07:04:05 2015
New Revision: 1707666

URL: http://svn.apache.org/viewvc?rev=1707666&view=rev
Log:
nerged fix for STANBOL-1442 to trunk

Modified:
    
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
    
stanbol/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngineComponent.java

Modified: 
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
URL: 
http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java?rev=1707666&r1=1707665&r2=1707666&view=diff
==============================================================================
--- 
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
 (original)
+++ 
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
 Fri Oct  9 07:04:05 2015
@@ -192,7 +192,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/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngineComponent.java
URL: 
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngineComponent.java?rev=1707666&r1=1707665&r2=1707666&view=diff
==============================================================================
--- 
stanbol/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngineComponent.java
 (original)
+++ 
stanbol/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngineComponent.java
 Fri Oct  9 07:04:05 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");