You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by sh...@apache.org on 2009/01/29 17:39:02 UTC
svn commit: r738916 - in /lucene/solr/trunk: CHANGES.txt
example/solr/conf/schema.xml src/java/org/apache/solr/core/Config.java
Author: shalin
Date: Thu Jan 29 16:39:01 2009
New Revision: 738916
URL: http://svn.apache.org/viewvc?rev=738916&view=rev
Log:
SOLR-991 -- Better error message when parsing solrconfig.xml fails due to malformed XML. Error message notes the name of the file being parsed.
Modified:
lucene/solr/trunk/CHANGES.txt
lucene/solr/trunk/example/solr/conf/schema.xml
lucene/solr/trunk/src/java/org/apache/solr/core/Config.java
Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=738916&r1=738915&r2=738916&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Thu Jan 29 16:39:01 2009
@@ -223,6 +223,9 @@
26. SOLR-883: Implicit properties are not set for Cores created through CoreAdmin (Noble Paul via shalin)
+27. SOLR-991: Better error message when parsing solrconfig.xml fails due to malformed XML. Error message notes the name
+ of the file being parsed. (Michael Henson via shalin)
+
Other Changes
----------------------
Modified: lucene/solr/trunk/example/solr/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/example/solr/conf/schema.xml?rev=738916&r1=738915&r2=738916&view=diff
==============================================================================
--- lucene/solr/trunk/example/solr/conf/schema.xml (original)
+++ lucene/solr/trunk/example/solr/conf/schema.xml Thu Jan 29 16:39:01 2009
@@ -30,7 +30,7 @@
NOTE: this schema includes many optional features and should not
be used for benchmarking.
--->
+-- >
<schema name="example" version="1.1">
<!-- attribute "name" is the name of this schema and is only used for display purposes.
Modified: lucene/solr/trunk/src/java/org/apache/solr/core/Config.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/Config.java?rev=738916&r1=738915&r2=738916&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/Config.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/Config.java Thu Jan 29 16:39:01 2009
@@ -104,6 +104,12 @@
doc = builder.parse(lis);
DOMUtil.substituteProperties(doc, loader.getCoreProperties());
+ } catch (ParserConfigurationException e) {
+ SolrException.log(log, "Exception during parsing file: " + name, e);
+ throw e;
+ } catch (SAXException e) {
+ SolrException.log(log, "Exception during parsing file: " + name, e);
+ throw e;
} catch( SolrException e ){
SolrException.log(log,"Error in "+name,e);
throw e;