Changeset 31041 for other-projects

Timestamp:

2016-11-02T20:07:40+13:00 (7 years ago)

Author:

davidb

Message:

Test needs to be more careful if -read-only specified

File:

• other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/org/hathitrust/extractedfeatures/ProcessForSolrIngest.java (modified) (1 diff)

other-projects/hathitrust/wcsa/extracted-features-solr/trunk/solr-ingest/src/main/java/org/hathitrust/extractedfeatures/ProcessForSolrIngest.java

@@ -110 +110 @@
         ArrayList<String> solr_endpoints = new ArrayList<String>();
         
-        String solr_endpoint_ips = System.getProperty("wcsa-ef-ingest.solr-endpoint-ips",null);
-        if (solr_endpoint_ips != null) {
-            String [] ips = solr_endpoint_ips.split(",");
-            for (String ip : ips) {
-                String solr_endpoint = _solr_url.replaceFirst("//.*?:", "//"+ip+":");
-                solr_endpoints.add(solr_endpoint);
+        if (_solr_url != null) {
+            String solr_endpoint_ips = System.getProperty("wcsa-ef-ingest.solr-endpoint-ips",null);
+            if (solr_endpoint_ips != null) {
+                String [] ips = solr_endpoint_ips.split(",");
+                for (String ip : ips) {
+                    String solr_endpoint = _solr_url.replaceFirst("//.*?:", "//"+ip+":");
+                    solr_endpoints.add(solr_endpoint);
+                }
             }
-        }
-        else {
-            if (_solr_url != null) {
+            else {
                 solr_endpoints.add(_solr_url);
             }
         }
-
+        
         return solr_endpoints;
     }