svn commit: r1685290 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java

[an...@apache.org]

Author: andyetitmoves
Date: Sat Jun 13 17:00:24 2015
New Revision: 1685290

URL: http://svn.apache.org/r1685290
Log:
SOLR-7274: Removed a few eager string constructions from log.debug

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java

Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java?rev=1685290&r1=1685289&r2=1685290&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java Sat Jun 13 17:00:24 2015
@@ -89,7 +89,7 @@ public class SolrDispatchFilter extends
   @Override
   public void init(FilterConfig config) throws ServletException
   {
-    log.info("SolrDispatchFilter.init()" + this.getClass().getClassLoader());
+    log.info("SolrDispatchFilter.init(): {}", this.getClass().getClassLoader());
     String exclude = config.getInitParameter("excludePatterns");
     if(exclude != null) {
       String[] excludeArray = exclude.split(",");
@@ -157,7 +157,7 @@ public class SolrDispatchFilter extends
 
     if ("zookeeper".equalsIgnoreCase(solrxmlLocation)) {
       String zkHost = System.getProperty("zkHost");
-      log.info("Trying to read solr.xml from " + zkHost);
+      log.info("Trying to read solr.xml from {}", zkHost);
       if (StringUtils.isEmpty(zkHost))
         throw new SolrException(ErrorCode.SERVER_ERROR,
             "Could not load solr.xml from zookeeper: zkHost system property not set");
@@ -207,12 +207,12 @@ public class SolrDispatchFilter extends
       request = wrappedRequest.get();
     }
     if (cores.getAuthenticationPlugin() != null) {
-      log.debug("User principal: "+((HttpServletRequest)request).getUserPrincipal());
+      log.debug("User principal: {}", ((HttpServletRequest)request).getUserPrincipal());
     }
 
     // No need to even create the HttpSolrCall object if this path is excluded.
     if(excludePatterns != null) {
-      String servletPath = ((HttpServletRequest) request).getServletPath().toString();
+      String servletPath = ((HttpServletRequest) request).getServletPath();
       for (Pattern p : excludePatterns) {
         Matcher matcher = p.matcher(servletPath);
         if (matcher.lookingAt()) {
@@ -256,7 +256,7 @@ public class SolrDispatchFilter extends
       return true;
     } else {
       try {
-        log.debug("Request to authenticate: "+request+", domain: "+request.getLocalName()+", port: "+request.getLocalPort());
+        log.debug("Request to authenticate: {}, domain: {}, port: {}", request, request.getLocalName(), request.getLocalPort());
         // upon successful authentication, this should call the chain's next filter.
         authenticationPlugin.doAuthenticate(request, response, new FilterChain() {
           public void doFilter(ServletRequest req, ServletResponse rsp) throws IOException, ServletException {