You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by jo...@apache.org on 2011/05/12 14:39:40 UTC

svn commit: r1102263 - in /incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools: dictionary/serializer/DictionarySerializer.java util/model/DictionarySerializer.java

Author: joern
Date: Thu May 12 12:39:40 2011
New Revision: 1102263

URL: http://svn.apache.org/viewvc?rev=1102263&view=rev
Log:
OPENNLP-171 Passed Input Stream to DictionarySerializer is not closed anymore.

Modified:
    incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/dictionary/serializer/DictionarySerializer.java
    incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/DictionarySerializer.java

Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/dictionary/serializer/DictionarySerializer.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/dictionary/serializer/DictionarySerializer.java?rev=1102263&r1=1102262&r2=1102263&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/dictionary/serializer/DictionarySerializer.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/dictionary/serializer/DictionarySerializer.java Thu May 12 12:39:40 2011
@@ -34,6 +34,7 @@ import javax.xml.transform.stream.Stream
 
 import opennlp.tools.util.InvalidFormatException;
 import opennlp.tools.util.StringList;
+import opennlp.tools.util.model.UncloseableInputStream;
 
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
@@ -200,7 +201,7 @@ public class DictionarySerializer {
     try {
       xmlReader = XMLReaderFactory.createXMLReader();
       xmlReader.setContentHandler(profileContentHandler);
-      xmlReader.parse(new InputSource(in));
+      xmlReader.parse(new InputSource(new UncloseableInputStream(in)));
     }
     catch (SAXException e) {
       throw new InvalidFormatException("The profile data stream has " +

Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/DictionarySerializer.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/DictionarySerializer.java?rev=1102263&r1=1102262&r2=1102263&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/DictionarySerializer.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/DictionarySerializer.java Thu May 12 12:39:40 2011
@@ -30,7 +30,6 @@ class DictionarySerializer implements Ar
 
   public Dictionary create(InputStream in) throws IOException,
       InvalidFormatException {
-    // TODO: Attention stream is closed
     return new Dictionary(in);
   }