svn commit: r1245505 - in /tika/trunk/tika-core/src: main/java/org/apache/tika/mime/MimeTypes.java main/java/org/apache/tika/parser/external/ExternalParsersFactory.java test/resources/org/apache/tika/parser/ test/resources/org/apache/tika/parser/external/

[nick]

Author: nick
Date: Fri Feb 17 14:10:21 2012
New Revision: 1245505

URL: http://svn.apache.org/viewvc?rev=1245505&view=rev
Log:
TIKA-865 Tweak what we lock on

Added:
    tika/trunk/tika-core/src/test/resources/org/apache/tika/parser/
    tika/trunk/tika-core/src/test/resources/org/apache/tika/parser/external/
Modified:
    tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java
    
tika/trunk/tika-core/src/main/java/org/apache/tika/parser/external/ExternalParsersFactory.java

Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java?rev=1245505&r1=1245504&r2=1245505&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java 
(original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java Fri 
Feb 17 14:10:21 2012
@@ -269,7 +269,7 @@ public final class MimeTypes implements 
             MimeType mime = types.get(normalisedType);
             
             if (mime == null) {
-                synchronized (types) {
+                synchronized (this) {
                    // Double check it didn't already get added while 
                    //  we were waiting for the lock
                    mime = types.get(normalisedType);

Modified: 
tika/trunk/tika-core/src/main/java/org/apache/tika/parser/external/ExternalParsersFactory.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/external/ExternalParsersFactory.java?rev=1245505&r1=1245504&r2=1245505&view=diff
==============================================================================
--- 
tika/trunk/tika-core/src/main/java/org/apache/tika/parser/external/ExternalParsersFactory.java
 (original)
+++ 
tika/trunk/tika-core/src/main/java/org/apache/tika/parser/external/ExternalParsersFactory.java
 Fri Feb 17 14:10:21 2012
@@ -23,10 +23,14 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.tika.config.ServiceLoader;
 import org.apache.tika.config.TikaConfig;
 import org.apache.tika.exception.TikaException;
+import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.CompositeParser;
+import org.apache.tika.parser.Parser;
 
 /**
  * Creates instances of ExternalParser based on XML 
@@ -75,6 +79,11 @@ public class ExternalParsersFactory {
    }
    
    public static void attachExternalParsers(List<ExternalParser> parsers, 
TikaConfig config) {
+      Parser parser = config.getParser();
+      if (parser instanceof CompositeParser) {
+         CompositeParser cParser = (CompositeParser)parser;
+         Map<MediaType,Parser> parserMap = cParser.getParsers();
+      }
       // TODO
    }
 }