lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From no...@apache.org
Subject svn commit: r1652442 - in /lucene/dev/branches/lucene_solr_5_0/solr/core/src: java/org/apache/solr/core/RequestHandlers.java test/org/apache/solr/core/TestDynamicLoading.java test/org/apache/solr/core/TestSolrConfigHandler.java
Date Fri, 16 Jan 2015 15:53:43 GMT
Author: noble
Date: Fri Jan 16 15:53:43 2015
New Revision: 1652442

URL: http://svn.apache.org/r1652442
Log:
SOLR-6801 version can be string or number

Modified:
    lucene/dev/branches/lucene_solr_5_0/solr/core/src/java/org/apache/solr/core/RequestHandlers.java
    lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java
    lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java

Modified: lucene/dev/branches/lucene_solr_5_0/solr/core/src/java/org/apache/solr/core/RequestHandlers.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_0/solr/core/src/java/org/apache/solr/core/RequestHandlers.java?rev=1652442&r1=1652441&r2=1652442&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_0/solr/core/src/java/org/apache/solr/core/RequestHandlers.java
(original)
+++ lucene/dev/branches/lucene_solr_5_0/solr/core/src/java/org/apache/solr/core/RequestHandlers.java
Fri Jan 16 15:53:43 2015
@@ -433,14 +433,14 @@ public final class RequestHandlers {
         return;
       }
 
-      version = _pluginInfo.attributes.get("version");
-      if (version == null) {
+      if (_pluginInfo.attributes.get("version") == null ){
         errMsg = "ERROR 'lib' attribute must be accompanied with version also";
         unrecoverable = true;
         _handler = this;
         log.error(errMsg);
         return;
       }
+      version = String.valueOf(_pluginInfo.attributes.get("version"));
       classLoader = new MemClassLoader(this);
     }
 

Modified: lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java?rev=1652442&r1=1652441&r2=1652442&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java
(original)
+++ lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java
Fri Jan 16 15:53:43 2015
@@ -30,6 +30,7 @@ import org.junit.After;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
@@ -132,7 +133,7 @@ public class TestDynamicLoading extends
 
 
     payload = "{\n" +
-        "'update-requesthandler' : { 'name' : '/test1', 'class': 'org.apache.solr.core.BlobStoreTestRequestHandlerV2'
, 'lib':'test','version':'2'}\n" +
+        "'update-requesthandler' : { 'name' : '/test1', 'class': 'org.apache.solr.core.BlobStoreTestRequestHandlerV2'
, 'lib':'test','version':2}\n" +
         "}";
 
     client = restTestHarnesses.get(random().nextInt(restTestHarnesses.size()));
@@ -142,7 +143,7 @@ public class TestDynamicLoading extends
         "/config/overlay?wt=json",
         null,
         Arrays.asList("overlay", "requestHandler", "/test1", "version"),
-        "2",10);
+        2l,10);
 
     success= false;
     for(int i=0;i<100;i++) {

Modified: lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java?rev=1652442&r1=1652441&r2=1652442&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
(original)
+++ lucene/dev/branches/lucene_solr_5_0/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
Fri Jan 16 15:53:43 2015
@@ -233,7 +233,7 @@ public class TestSolrConfigHandler exten
                                             String testServerBaseUrl,
                                             String uri,
                                             CloudSolrClient cloudSolrServer,List<String>
jsonPath,
-                                            String expected,
+                                            Object expected,
                                             long maxTimeoutSeconds ) throws Exception {
 
     boolean success = false;



Mime
View raw message