lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From no...@apache.org
Subject lucene-solr:apiv2: SOLR-8029: precommit errors
Date Mon, 18 Apr 2016 14:11:43 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/apiv2 2519b2fe6 -> 4a1f9c86d


SOLR-8029: precommit errors


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4a1f9c86
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4a1f9c86
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4a1f9c86

Branch: refs/heads/apiv2
Commit: 4a1f9c86df0b9d68d46eca2ea111c8c76b1ca0e5
Parents: 2519b2f
Author: Noble Paul <noble@apache.org>
Authored: Mon Apr 18 19:41:33 2016 +0530
Committer: Noble Paul <noble@apache.org>
Committed: Mon Apr 18 19:41:33 2016 +0530

----------------------------------------------------------------------
 solr/core/src/java/org/apache/solr/api/ApiBag.java             | 3 ++-
 .../src/java/org/apache/solr/handler/admin/InfoHandler.java    | 4 +++-
 solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java   | 6 +-----
 solr/solrj/src/java/org/apache/solr/common/util/Predicate.java | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4a1f9c86/solr/core/src/java/org/apache/solr/api/ApiBag.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/api/ApiBag.java b/solr/core/src/java/org/apache/solr/api/ApiBag.java
index 90362f5..886c1d5 100644
--- a/solr/core/src/java/org/apache/solr/api/ApiBag.java
+++ b/solr/core/src/java/org/apache/solr/api/ApiBag.java
@@ -20,6 +20,7 @@ package org.apache.solr.api;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -52,7 +53,7 @@ import static org.apache.solr.common.util.Map2.NOT_NULL;
 import static org.apache.solr.common.util.StrUtils.formatString;
 
 public class ApiBag {
-  private static final Logger log = LoggerFactory.getLogger(ApiBag.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   private final Map<String, PathTrie<Api>> apis = new ConcurrentHashMap<>();
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4a1f9c86/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java
index acbb395..1164ab5 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java
@@ -16,6 +16,7 @@
  */
 package org.apache.solr.handler.admin;
 
+import java.lang.invoke.MethodHandles;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Locale;
@@ -41,7 +42,8 @@ import static org.apache.solr.api.ApiBag.getSpec;
 import static org.apache.solr.common.params.CommonParams.PATH;
 
 public class InfoHandler extends RequestHandlerBase implements ApiSupport {
-  protected static Logger log = LoggerFactory.getLogger(InfoHandler.class);
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
   protected final CoreContainer coreContainer;
 
   /**

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4a1f9c86/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
index a3dc7a0..ecfa8ab 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -496,11 +496,7 @@ public class HttpSolrCall {
             writeResponse(solrRsp, responseWriter, reqMethod);
           }
           return RETURN;
-        default: {
-          //TODO NOCOMMIT
-          log.error("NOACTION" + solrReq);
-          return action;
-        }
+        default: return action;
       }
     } catch (Throwable ex) {
       log.error("ERROR" ,ex);

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4a1f9c86/solr/solrj/src/java/org/apache/solr/common/util/Predicate.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/Predicate.java b/solr/solrj/src/java/org/apache/solr/common/util/Predicate.java
index fbe48ad..493532b 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/Predicate.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/Predicate.java
@@ -24,7 +24,7 @@ public interface Predicate<T> {
    * or return a string with a message;
    *
    * @param t test value
-   * @return
+   * @return null if test succeeds or an error description if test fails
    */
   String test(T t);
 


Mime
View raw message