svn commit: r1717557 - in /tika/branches/2.x: CHANGES.txt tika-core/src/main/java/org/apache/tika/config/TikaConfig.java

[ni...@apache.org]

Author: nick
Date: Tue Dec  1 23:58:32 2015
New Revision: 1717557

URL: http://svn.apache.org/viewvc?rev=1717557&view=rev
Log:
Change the default LoadErrorHandler for Tika 2.x to be warn (TIKA-1805)

Modified:
    tika/branches/2.x/CHANGES.txt
    tika/branches/2.x/tika-core/src/main/java/org/apache/tika/config/TikaConfig.java

Modified: tika/branches/2.x/CHANGES.txt
URL: http://svn.apache.org/viewvc/tika/branches/2.x/CHANGES.txt?rev=1717557&r1=1717556&r2=1717557&view=diff
==============================================================================
--- tika/branches/2.x/CHANGES.txt (original)
+++ tika/branches/2.x/CHANGES.txt Tue Dec  1 23:58:32 2015
@@ -1,3 +1,11 @@
+Release 2.0 - Future Development
+
+  * The default LoadErrorHandler is now WARN, to alert you to missing
+    parser classes and their dependencies. To keep the old behaviour,
+    set your LoadErrorHandler to IGNORE. (TIKA-1805)
+
+  * (Something about more specific parser bundles, plus an overall one)
+
 Release 1.12 - Current Development
 
   * A parser to compute motion properties in Videos, e.g., 

Modified: tika/branches/2.x/tika-core/src/main/java/org/apache/tika/config/TikaConfig.java
URL: http://svn.apache.org/viewvc/tika/branches/2.x/tika-core/src/main/java/org/apache/tika/config/TikaConfig.java?rev=1717557&r1=1717556&r2=1717557&view=diff
==============================================================================
--- tika/branches/2.x/tika-core/src/main/java/org/apache/tika/config/TikaConfig.java (original)
+++ tika/branches/2.x/tika-core/src/main/java/org/apache/tika/config/TikaConfig.java Tue Dec  1 23:58:32 2015
@@ -447,10 +447,10 @@ public class TikaConfig {
         ServiceLoader serviceLoader;
         if (serviceLoaderElement != null) {
             boolean dynamic = Boolean.parseBoolean(serviceLoaderElement.getAttribute("dynamic"));
-            LoadErrorHandler loadErrorHandler = LoadErrorHandler.IGNORE;
+            LoadErrorHandler loadErrorHandler = LoadErrorHandler.WARN;
             String loadErrorHandleConfig = serviceLoaderElement.getAttribute("loadErrorHandler");
-            if(LoadErrorHandler.WARN.toString().equalsIgnoreCase(loadErrorHandleConfig)) {
-                loadErrorHandler = LoadErrorHandler.WARN;
+            if(LoadErrorHandler.IGNORE.toString().equalsIgnoreCase(loadErrorHandleConfig)) {
+                loadErrorHandler = LoadErrorHandler.IGNORE;
             } else if(LoadErrorHandler.THROW.toString().equalsIgnoreCase(loadErrorHandleConfig)) {
                 loadErrorHandler = LoadErrorHandler.THROW;
             }