mirror of https://github.com/apache/lucene.git
SOLR-241: Undefined system properties used in configuration files now cause a clear message to be logged rather than an obscure exception thrown.
git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@538800 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
0d968a3ff0
commit
2ddd39225a
|
@ -307,6 +307,10 @@ Bug Fixes
|
||||||
utf-8 encoding. If you do not specify a contentType, it will use the
|
utf-8 encoding. If you do not specify a contentType, it will use the
|
||||||
platform default. (Koji Sekiguchi via ryan)
|
platform default. (Koji Sekiguchi via ryan)
|
||||||
|
|
||||||
|
15. SOLR-241: Undefined system properties used in configuration files now
|
||||||
|
cause a clear message to be logged rather than an obscure exception thrown.
|
||||||
|
(Koji Sekiguchi via ehatcher)
|
||||||
|
|
||||||
Other Changes
|
Other Changes
|
||||||
1. Updated to Lucene 2.1
|
1. Updated to Lucene 2.1
|
||||||
|
|
||||||
|
|
|
@ -64,8 +64,14 @@ public class Config {
|
||||||
javax.xml.parsers.DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
|
javax.xml.parsers.DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
|
||||||
doc = builder.parse(is);
|
doc = builder.parse(is);
|
||||||
|
|
||||||
|
try{
|
||||||
DOMUtil.substituteSystemProperties(doc);
|
DOMUtil.substituteSystemProperties(doc);
|
||||||
}
|
}
|
||||||
|
catch( SolrException e ){
|
||||||
|
SolrException.log(log,"Error in "+name,e);
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public Document getDocument() {
|
public Document getDocument() {
|
||||||
return doc;
|
return doc;
|
||||||
|
|
Loading…
Reference in New Issue