diff --git a/contrib/dataimporthandler/CHANGES.txt b/contrib/dataimporthandler/CHANGES.txt index e78a1d9bdc1..6def8b8ccbc 100644 --- a/contrib/dataimporthandler/CHANGES.txt +++ b/contrib/dataimporthandler/CHANGES.txt @@ -22,9 +22,13 @@ New Features ---------------------- * SOLR-1525 allow DIH to refer to core properties (noble) + * SOLR-1547 TemplateTransformer copy objects more intelligently when there when the template is a single variable (noble) + * SOLR-1627 VariableResolver should be fetched just in time (noble) -* SOLR-1583 Create DataSources that return InputStream (noble) + +* SOLR-1583 Create DataSources that return InputStream (noble) + Optimizations ---------------------- @@ -36,6 +40,8 @@ Bug Fixes * SOLR-1639: Fixed misleading error message when dataimport.properties is not writable (shalin) +* SOLR-1598: Reader used in PlainTextEntityProcessor is not explicitly closed (Sascha Szott via noble) + Other Changes ---------------------- diff --git a/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java b/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java index 4b18d3c0d8d..f61d51e688b 100644 --- a/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java +++ b/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java @@ -19,6 +19,7 @@ package org.apache.solr.handler.dataimport; import static org.apache.solr.handler.dataimport.DataImportHandlerException.SEVERE; import static org.apache.solr.handler.dataimport.DataImportHandlerException.wrapAndThrow; import static org.apache.solr.handler.dataimport.XPathEntityProcessor.URL; +import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -77,6 +78,7 @@ public class PlainTextEntityProcessor extends EntityProcessorBase { Map row = new HashMap(); row.put(PLAIN_TEXT, sw.toString()); ended = true; + IOUtils.closeQuietly(r); return row; }