Author: sergiykarpenko Date: 2010-09-07 05:36:10 -0400 (Tue, 07 Sep 2010) New Revision: 3064 Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java 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/TikaDocumentReader.java =================================================================== --- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java 2010-09-06 13:54:01 UTC (rev 3063) +++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java 2010-09-07 09:36:10 UTC (rev 3064) @@ -108,7 +108,13 @@ } finally { - is.close(); + try + { + is.close(); + } + catch (Throwable e) + { + } } } @@ -139,7 +145,13 @@ } finally { - is.close(); + try + { + is.close(); + } + catch (Throwable e) + { + } } } @@ -198,7 +210,13 @@ } finally { - is.close(); + try + { + is.close(); + } + catch (Throwable e) + { + } } } 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 13:54:01 UTC (rev 3063) +++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReaderServiceImpl.java 2010-09-07 09:36:10 UTC (rev 3064) @@ -72,7 +72,8 @@ public DocumentReader getDocumentReader(String mimeType) throws HandlerNotFoundException { // first check user defined old-style and previously registered TikaDocumentReaders - DocumentReader reader = readers_.get(mimeType.toLowerCase()); + mimeType = mimeType.toLowerCase(); + DocumentReader reader = readers_.get(mimeType); if (reader != null) { @@ -83,32 +84,32 @@ // 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) + Parser tikaParser = conf.getParser(mimeType); + if (tikaParser != null) { - // Check if the reader has been registered since the thread is blocked - reader = readers_.get(mimeType); - if (reader != null) + synchronized (this) { - return reader; - } + // Check if the reader has been registered since the thread is blocked + reader = readers_.get(mimeType); + if (reader != null) + { + return reader; + } - Parser tikaParser = conf.getParser(mimeType); - if (tikaParser != null) - { 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; + readers_ = tmpReaders; return reader; } - else - { - throw new HandlerNotFoundException("No appropriate properties extractor for " + mimeType); - } } + else + { + throw new HandlerNotFoundException("No appropriate properties extractor for " + mimeType); + } } } }