[exo-jcr-commits] exo-jcr SVN: r3060 - core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika.

Author: sergiykarpenko Date: 2010-09-06 07:00:50 -0400 (Mon, 06 Sep 2010) New Revision: 3060 Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReaderServiceImpl.java Log: EXOJCR-749: TikaDocumentReaderService updated Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReaderServiceImpl.java =================================================================== --- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReaderServiceImpl.java 2010-09-06 09:26:17 UTC (rev 3059) +++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReaderServiceImpl.java 2010-09-06 11:00:50 UTC (rev 3060) @@ -25,6 +25,8 @@ import org.exoplatform.services.document.impl.DocumentReaderServiceImpl; import java.io.InputStream; +import java.util.HashMap; +import java.util.Map; /** * Created by The eXo Platform SAS. @@ -69,34 +71,37 @@ */ public DocumentReader getDocumentReader(String mimeType) throws HandlerNotFoundException { - try + // first check user defined old-style and previously registered TikaDocumentReaders + DocumentReader reader = readers_.get(mimeType.toLowerCase()); + + if (reader != null) { - // first check user defined old-style and previously registered TikaDocumentReaders - return super.getDocumentReader(mimeType); + return reader; } - catch (HandlerNotFoundException e) + else { // tika-config may contain really big amount of mimetypes, but used only few, // so to avoid load in memory many copies of DocumentReader, we will register it // only if someone need it synchronized (this) { - //check again - previous thread may register TikaDocumenReader that we are looking - try + // Check if the reader has been registered since the thread is blocked + reader = readers_.get(mimeType); + if (reader != null) { - return super.getDocumentReader(mimeType); + return reader; } - catch (HandlerNotFoundException ex) - { - // keep working - } Parser tikaParser = conf.getParser(mimeType); if (tikaParser != null) { - TikaDocumentReader reader = new TikaDocumentReader(tikaParser, mimeType); - //register new document reader - super.readers_.put(mimeType, reader); + reader = new TikaDocumentReader(tikaParser, mimeType); + // Initialize the map with the existing values + Map<String, DocumentReader> tmpReaders = new HashMap<String, DocumentReader>(readers_); + // Register new document reader + tmpReaders.put(mimeType, reader); + // Update the map of readers + this.readers_ = tmpReaders; return reader; } else