You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2017/02/23 15:23:50 UTC

tika git commit: TIKA-2276 -- rollback...sorry.

Repository: tika
Updated Branches:
  refs/heads/master bce5c795f -> 10ca360c2


TIKA-2276 -- rollback...sorry.


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

Branch: refs/heads/master
Commit: 10ca360c229d82997540a629183c75def21bd31d
Parents: bce5c79
Author: tballison <ta...@mitre.org>
Authored: Thu Feb 23 10:23:41 2017 -0500
Committer: tballison <ta...@mitre.org>
Committed: Thu Feb 23 10:23:41 2017 -0500

----------------------------------------------------------------------
 .../main/java/org/apache/tika/parser/AutoDetectParser.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tika/blob/10ca360c/tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java
----------------------------------------------------------------------
diff --git a/tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java b/tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java
index 9fcff2b..3b27104 100644
--- a/tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java
+++ b/tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java
@@ -36,7 +36,7 @@ public class AutoDetectParser extends CompositeParser {
 
     /** Serial version UID */
     private static final long serialVersionUID = 6110455808615143122L;
-    private final TikaConfig config;
+    //private final TikaConfig config;
 
     /**
      * The type detector used by this parser to auto-detect the type
@@ -72,13 +72,13 @@ public class AutoDetectParser extends CompositeParser {
     public AutoDetectParser(Detector detector, Parser...parsers) {
         super(MediaTypeRegistry.getDefaultRegistry(), parsers);
         setDetector(detector);
-        config = TikaConfig.getDefaultConfig();
+        //config = TikaConfig.getDefaultConfig();
     }
 
     public AutoDetectParser(TikaConfig config) {
         super(config.getMediaTypeRegistry(), config.getParser());
         setDetector(config.getDetector());
-        this.config = config;
+        //this.config = config;
     }
 
     /**
@@ -122,7 +122,7 @@ public class AutoDetectParser extends CompositeParser {
             //pass the config to the parsers if
             //the caller hasn't specified one.
             if (context.get(TikaConfig.class) == null) {
-                context.set(TikaConfig.class, config);
+            //    context.set(TikaConfig.class, config);
             }
 
             try {