svn commit: r1647034 - in /lucene/dev/trunk/solr/core/src: java/org/apache/solr/core/RequestHandlers.java test/org/apache/solr/core/BlobStoreTestRequestHandler.java test/org/apache/solr/core/TestDynamicLoading.java

[no...@apache.org]

Author: noble
Date: Sat Dec 20 18:43:53 2014
New Revision: 1647034

URL: http://svn.apache.org/r1647034
Log:
SOLR-6801 addressing test failures

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/RequestHandlers.java
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/BlobStoreTestRequestHandler.java
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/RequestHandlers.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/RequestHandlers.java?rev=1647034&r1=1647033&r2=1647034&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/RequestHandlers.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/RequestHandlers.java Sat Dec 20 18:43:53 2014
@@ -532,6 +532,7 @@ public final class RequestHandlers {
         try {
           if(jarContent == null) checkJarAvailable();
           buf = jarContent.jar.getFileContent(path);
+          if(buf==null) throw new ClassNotFoundException("class not found in loaded jar"+ name ) ;
         } catch (IOException e1) {
           throw new ClassNotFoundException("class not found "+ name ,e1) ;
 

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/BlobStoreTestRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/BlobStoreTestRequestHandler.java?rev=1647034&r1=1647033&r2=1647034&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/BlobStoreTestRequestHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/BlobStoreTestRequestHandler.java Sat Dec 20 18:43:53 2014
@@ -28,6 +28,6 @@ public class BlobStoreTestRequestHandler
   @Override
   public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws IOException {
     super.handleRequestBody(req, rsp);
-    rsp.add("classloader", this.getClass().getClassLoader().getClass().getName());
+    rsp.add("class", BlobStoreTestRequestHandler.class.getName());
   }
 }

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java?rev=1647034&r1=1647033&r2=1647034&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java Sat Dec 20 18:43:53 2014
@@ -20,6 +20,7 @@ package org.apache.solr.core;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -30,6 +31,7 @@ import java.util.zip.ZipOutputStream;
 import org.apache.solr.client.solrj.SolrServer;
 import org.apache.solr.client.solrj.impl.HttpSolrServer;
 import org.apache.solr.cloud.AbstractFullDistribZkTestBase;
+import org.apache.solr.common.cloud.ZkStateReader;
 import org.apache.solr.handler.TestBlobHandler;
 import org.apache.solr.util.RESTfulServerProvider;
 import org.apache.solr.util.RestTestHarness;
@@ -96,8 +98,7 @@ public class TestDynamicLoading extends
 
 //    Thread.sleep(100);
     map = TestSolrConfigHandler.getRespMap("/test1?wt=json", client);
-
-    assertEquals(RequestHandlers.MemClassLoader.class.getName(), map.get("classloader"));
+    assertEquals(new String( ZkStateReader.toJSON(map) , StandardCharsets.UTF_8), BlobStoreTestRequestHandler.class.getName(), map.get("class"));
 
 
   }