You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2015/08/07 15:08:20 UTC

svn commit: r1694681 - in /lucene/dev/trunk/solr/core/src/java/org/apache/solr: core/CoreContainer.java security/PKIAuthenticationPlugin.java

Author: noble
Date: Fri Aug  7 13:08:20 2015
New Revision: 1694681

URL: http://svn.apache.org/r1694681
Log:
SOLR-7849: avoid re-regisetring pkiAuthentication plugin http interceptor

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java?rev=1694681&r1=1694680&r2=1694681&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java Fri Aug  7 13:08:20 2015
@@ -306,8 +306,11 @@ public class CoreContainer {
       getUpdateShardHandler().reconfigureHttpClient(configurer);
     } else {
       if (pkiAuthenticationPlugin != null) {
+        //this happened due to an authc plugin reload. no need to register the pkiAuthc plugin again
+        if(pkiAuthenticationPlugin.isInterceptorRegistered()) return;
         log.info("PKIAuthenticationPlugin is managing internode requests");
         addHttpConfigurer(pkiAuthenticationPlugin);
+        pkiAuthenticationPlugin.setInterceptorRegistered();
       }
     }
   }

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java?rev=1694681&r1=1694680&r2=1694681&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java Fri Aug  7 13:08:20 2015
@@ -66,6 +66,16 @@ public class PKIAuthenticationPlugin ext
   private int maxValidity = 5000;
   private final String myNodeName;
 
+  private boolean interceptorRegistered = false;
+
+  public void setInterceptorRegistered(){
+    this.interceptorRegistered = true;
+  }
+
+  public boolean isInterceptorRegistered(){
+    return interceptorRegistered;
+  }
+
   public PKIAuthenticationPlugin(CoreContainer cores, String nodeName) {
     this.cores = cores;
     myNodeName = nodeName;