You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2013/04/23 03:25:49 UTC
svn commit: r1470773 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/core/ConfigSolrXml.java
solr/core/src/java/org/apache/solr/core/SolrCores.java
solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java
Author: markrmiller
Date: Tue Apr 23 01:25:48 2013
New Revision: 1470773
URL: http://svn.apache.org/r1470773
Log:
SOLR-4749: Fix a few issues.
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/ConfigSolrXml.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrCores.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/ConfigSolrXml.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/ConfigSolrXml.java?rev=1470773&r1=1470772&r2=1470773&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/ConfigSolrXml.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/ConfigSolrXml.java Tue Apr 23 01:25:48 2013
@@ -53,7 +53,7 @@ public class ConfigSolrXml extends Confi
fillPropMap();
- String coreRoot = get(CfgProp.SOLR_COREROOTDIRECTORY, container.getSolrHome());
+ String coreRoot = get(CfgProp.SOLR_COREROOTDIRECTORY, (container == null ? null : container.getSolrHome()));
coreDescriptorMap = solrCoreDiscoverer.discover(container, new File(coreRoot));
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrCores.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrCores.java?rev=1470773&r1=1470772&r2=1470773&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrCores.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrCores.java Tue Apr 23 01:25:48 2013
@@ -1,5 +1,22 @@
package org.apache.solr.core;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
@@ -105,9 +122,6 @@ class SolrCores {
CoreContainer.log.info("Core " + coreName + " moved from core container list before closing.");
} else {
try {
- // nocommit: wtf is this?
- // addPersistOneCore(cfg, container.loader, core.getCoreDescriptor(), getCoreToOrigName(core));
-
core.close();
} catch (Throwable t) {
SolrException.log(CoreContainer.log, "Error shutting down core", t);
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java?rev=1470773&r1=1470772&r2=1470773&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java Tue Apr 23 01:25:48 2013
@@ -109,7 +109,6 @@ public class TestCoreDiscovery extends S
CoreContainer.Initializer init = new CoreContainer.Initializer();
final CoreContainer cores = init.initialize();
-
cores.setPersistent(false);
return cores;
}
@@ -139,11 +138,6 @@ public class TestCoreDiscovery extends S
try {
assertNull("defaultCore no longer allowed in solr.xml", cc.getDefaultCoreName());
- assertEquals("222.333.444.555", cc.zkSys.getHost());
- assertEquals("6000", cc.zkSys.getHostPort());
- assertEquals("solrprop", cc.zkSys.getHostContext());
- assertEquals(20, cc.zkSys.getZkClientTimeout());
-
TestLazyCores.checkInCores(cc, "core1");
TestLazyCores.checkNotInCores(cc, "lazy1", "core2", "collection1");