You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by bo...@apache.org on 2016/03/13 02:16:04 UTC

tika git commit: TIKA-1900 - Max pool size must be set prior to core pool size in Java 9

Repository: tika
Updated Branches:
  refs/heads/2.x 0b795dff0 -> 5f413ffa7


TIKA-1900 - Max pool size must be set prior to core pool size in Java 9

Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/5f413ffa
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/5f413ffa
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/5f413ffa

Branch: refs/heads/2.x
Commit: 5f413ffa77a7ae74729e654c4292b68ba3952966
Parents: 0b795df
Author: Bob Paulin <bo...@apache.org>
Authored: Sat Mar 12 19:15:55 2016 -0600
Committer: Bob Paulin <bo...@apache.org>
Committed: Sat Mar 12 19:15:55 2016 -0600

----------------------------------------------------------------------
 .../main/java/org/apache/tika/config/TikaConfig.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tika/blob/5f413ffa/tika-core/src/main/java/org/apache/tika/config/TikaConfig.java
----------------------------------------------------------------------
diff --git a/tika-core/src/main/java/org/apache/tika/config/TikaConfig.java b/tika-core/src/main/java/org/apache/tika/config/TikaConfig.java
index 1a33c4e..5cf0d60 100644
--- a/tika-core/src/main/java/org/apache/tika/config/TikaConfig.java
+++ b/tika-core/src/main/java/org/apache/tika/config/TikaConfig.java
@@ -846,16 +846,18 @@ public class TikaConfig {
         @Override
         ConfigurableThreadPoolExecutor decorate(ConfigurableThreadPoolExecutor created, Element element)
                 throws IOException, TikaException {
-            Element coreThreadElement = getChild(element, "core-threads");
-            if(coreThreadElement != null)
-            {
-                created.setCorePoolSize(Integer.parseInt(getText(coreThreadElement)));
-            }
             Element maxThreadElement = getChild(element, "max-threads");
             if(maxThreadElement != null)
             {
                 created.setMaximumPoolSize(Integer.parseInt(getText(maxThreadElement)));
             }
+            
+            Element coreThreadElement = getChild(element, "core-threads");
+            if(coreThreadElement != null)
+            {
+                created.setCorePoolSize(Integer.parseInt(getText(coreThreadElement)));
+            }
+            
             return created;
         }