From d7996c55837dd4591ef3f5ed8283b4c08edca249 Mon Sep 17 00:00:00 2001
From: Ramkumar Aiyengar <andyetitmoves@apache.org>
Date: Sat, 13 Jun 2015 16:58:55 +0000
Subject: [PATCH] SOLR-7274: Removed a few eager string constructions from
 log.debug

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1685289 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/solr/servlet/SolrDispatchFilter.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
index 2dd05e698cf..eaaf69772ec 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
@@ -89,7 +89,7 @@ public class SolrDispatchFilter extends BaseSolrFilter {
   @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 BaseSolrFilter {
 
     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 BaseSolrFilter {
       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 BaseSolrFilter {
       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 {