You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2013/09/27 18:15:12 UTC
svn commit: r1526972 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/schema/IndexSchema.java
Author: sarowe
Date: Fri Sep 27 16:15:11 2013
New Revision: 1526972
URL: http://svn.apache.org/r1526972
Log:
SOLR-5281: IndexSchema log message was printing '[null]' instead of '[<core name>]'
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1526972&r1=1526971&r2=1526972&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Sep 27 16:15:11 2013
@@ -81,6 +81,9 @@ Bug Fixes
----------------------
* SOLR-4590: Collections API should return a nice error when not in SolrCloud mode.
(Anshum Gupta, Mark Miller)
+
+* SOLR-5281: IndexSchema log message was printing '[null]' instead of
+ '[<core name>]' (Jun Ohtani via Steve Rowe)
Security
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java?rev=1526972&r1=1526971&r2=1526972&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java Fri Sep 27 16:15:11 2013
@@ -107,6 +107,7 @@ public class IndexSchema {
private static final String AT = "@";
private static final String DESTINATION_DYNAMIC_BASE = "destDynamicBase";
private static final String MAX_CHARS = "maxChars";
+ private static final String SOLR_CORE_NAME = "solr.core.name";
private static final String SOURCE_DYNAMIC_BASE = "sourceDynamicBase";
private static final String SOURCE_EXPLICIT_FIELDS = "sourceExplicitFields";
private static final String TEXT_FUNCTION = "text()";
@@ -436,7 +437,7 @@ public class IndexSchema {
// Another case where the initialization from the test harness is different than the "real world"
sb.append("[");
if (loader.getCoreProperties() != null) {
- sb.append(loader.getCoreProperties().getProperty(NAME));
+ sb.append(loader.getCoreProperties().getProperty(SOLR_CORE_NAME));
} else {
sb.append("null");
}