svn commit: r1703915 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/handler/IndexFetcher.java

[sh...@apache.org]

Author: shalin
Date: Fri Sep 18 19:32:58 2015
New Revision: 1703915

URL: http://svn.apache.org/viewvc?rev=1703915&view=rev
Log:
Renamed a few variables to be more explicit

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/handler/IndexFetcher.java

Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java?rev=1703915&r1=1703914&r2=1703915&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java Fri Sep 18 19:32:58 2015
@@ -157,9 +157,9 @@ public class IndexFetcher {
 
   private volatile boolean stop = false;
 
-  private boolean useInternal = false;
+  private boolean useInternalCompression = false;
 
-  private boolean useExternal = false;
+  private boolean useExternalCompression = false;
 
   private final HttpClient myHttpClient;
 
@@ -188,13 +188,13 @@ public class IndexFetcher {
     
     this.replicationHandler = handler;
     String compress = (String) initArgs.get(COMPRESSION);
-    useInternal = INTERNAL.equals(compress);
-    useExternal = EXTERNAL.equals(compress);
+    useInternalCompression = INTERNAL.equals(compress);
+    useExternalCompression = EXTERNAL.equals(compress);
     String connTimeout = (String) initArgs.get(HttpClientUtil.PROP_CONNECTION_TIMEOUT);
     String readTimeout = (String) initArgs.get(HttpClientUtil.PROP_SO_TIMEOUT);
     String httpBasicAuthUser = (String) initArgs.get(HttpClientUtil.PROP_BASIC_AUTH_USER);
     String httpBasicAuthPassword = (String) initArgs.get(HttpClientUtil.PROP_BASIC_AUTH_PASS);
-    myHttpClient = createHttpClient(solrCore, connTimeout, readTimeout, httpBasicAuthUser, httpBasicAuthPassword, useExternal);
+    myHttpClient = createHttpClient(solrCore, connTimeout, readTimeout, httpBasicAuthUser, httpBasicAuthPassword, useExternalCompression);
   }
 
   /**
@@ -1440,7 +1440,7 @@ public class IndexFetcher {
       } else {
         params.set(FILE, fileName);
       }
-      if (useInternal) {
+      if (useInternalCompression) {
         params.set(COMPRESSION, "true");
       }
       //use checksum
@@ -1466,7 +1466,7 @@ public class IndexFetcher {
         QueryRequest req = new QueryRequest(params);
         response = client.request(req);
         is = (InputStream) response.get("stream");
-        if(useInternal) {
+        if(useInternalCompression) {
           is = new InflaterInputStream(is);
         }
         return new FastInputStream(is);