You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/02/24 07:13:00 UTC
[53/53] [abbrv] lucene-solr git commit: SOLR-8029: Merging changes
from master
SOLR-8029: Merging changes from master
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c0b91afb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c0b91afb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c0b91afb
Branch: refs/heads/apiv2
Commit: c0b91afb94387b59eaca699831fedf015879c96b
Parents: ddeb53d
Author: Noble Paul <no...@apache.org>
Authored: Wed Feb 24 11:39:18 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Wed Feb 24 11:39:18 2016 +0530
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/handler/SchemaHandler.java | 2 +-
solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java | 2 +-
solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java | 1 -
solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c0b91afb/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java b/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
index 907a2a5..ea9381a 100644
--- a/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
@@ -51,7 +51,7 @@ import static org.apache.solr.common.params.CommonParams.JSON;
import static org.apache.solr.core.ConfigSetProperties.IMMUTABLE_CONFIGSET_ARG;
import static org.apache.solr.api.ApiBag.wrapRequestHandler;
-public class SchemaHandler extends RequestHandlerBase implements ApiSupport {
+public class SchemaHandler extends RequestHandlerBase implements ApiSupport , SolrCoreAware {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private boolean isImmutableConfigSet = false;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c0b91afb/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java b/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
index 7324a09..8f4a71a 100644
--- a/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
@@ -38,7 +38,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import com.google.common.base.Strings;
+import static com.google.common.base.Strings.isNullOrEmpty;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import org.apache.solr.client.solrj.SolrClient;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c0b91afb/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 6c7578b..fe368be 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -155,7 +155,6 @@ public class HttpSolrCall {
protected String coreUrl;
protected SolrConfig config;
protected Map<String, Integer> invalidStates;
- protected RequestType requestType;
protected boolean usingAliases = false;
//The states of client that is invalid in this request
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c0b91afb/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
index 0ae0865..f65ee7a 100644
--- a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
+++ b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java
@@ -78,7 +78,7 @@ public class TestSolrConfigHandler extends RestTestBase {
createJettyAndHarness(tmpSolrHome.getAbsolutePath(), "solrconfig-managed-schema.xml", "schema-rest.xml",
"/solr", true, extraServlets);
- if (true) {
+ if (random().nextBoolean()) {
log.info("These tests are run with V2 API");
restTestHarness.setServerProvider(new RESTfulServerProvider() {
@Override