jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thom...@apache.org
Subject svn commit: r701158 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ConfigurationErrorHandler.java
Date Thu, 02 Oct 2008 15:32:51 GMT
Author: thomasm
Date: Thu Oct  2 08:32:50 2008
New Revision: 701158

URL: http://svn.apache.org/viewvc?rev=701158&view=rev
Log:
JCR-1462 repository.xml: throw an exception on error - but only log a warning when not using
DTD

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ConfigurationErrorHandler.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ConfigurationErrorHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ConfigurationErrorHandler.java?rev=701158&r1=701157&r2=701158&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ConfigurationErrorHandler.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ConfigurationErrorHandler.java
Thu Oct  2 08:32:50 2008
@@ -36,11 +36,10 @@
      * The relevant information is written to the log file.
      */
     public void error(SAXParseException exception) throws SAXException {
-        logError("Error", exception);
-        throw exception;
+        log("Warning", exception);
     }
 
-    private void logError(String type, SAXParseException exception) {
+    private void log(String type, SAXParseException exception) {
         log.warn(type + " parsing the configuration at line " + exception.getLineNumber()
+ " using system id " + exception.getSystemId() + ": " + exception.toString());
     }
 
@@ -49,7 +48,7 @@
      * The relevant information is written to the log file.
      */
     public void fatalError(SAXParseException exception) throws SAXException {
-        logError("Fatal error", exception);
+        log("Fatal error", exception);
         throw exception;
     }
 
@@ -58,7 +57,7 @@
      * The relevant information is written to the log file.
      */
     public void warning(SAXParseException exception) throws SAXException {
-        logError("Warning", exception);
+        log("Warning", exception);
     }
 
 }



Mime
View raw message