Author: pkluegl
Date: Wed Aug 28 10:14:14 2013
New Revision: 1518140
URL: http://svn.apache.org/r1518140
Log:
UIMA-3194
- applied patch for closing scanner
Modified:
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/CSVTable.java
Modified:
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java?rev=1518140&r1=1518139&r2=1518140&view=diff
==============================================================================
---
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java
(original)
+++
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java
Wed Aug 28 10:14:14 2013
@@ -269,13 +269,15 @@ public class RutaEnvironment {
}
if (!found) {
InputStream stream = this.getClass().getResourceAsStream(table);
- found = true;
- try {
- tables.put(table, new CSVTable(stream));
- } catch (IOException e) {
- Logger.getLogger(this.getClass().getName()).log(Level.SEVERE,
- "Error reading csv table " + table + " from classpath", e);
- found = false;
+ if (stream != null) {
+ found = true;
+ try {
+ tables.put(table, new CSVTable(stream));
+ } catch (IOException e) {
+ Logger.getLogger(this.getClass().getName()).log(Level.SEVERE,
+ "Error reading csv table " + table + " from classpath", e);
+ found = false;
+ }
}
}
if (!found) {
Modified:
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/CSVTable.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/CSVTable.java?rev=1518140&r1=1518139&r2=1518140&view=diff
==============================================================================
---
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/CSVTable.java
(original)
+++
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/CSVTable.java
Wed Aug 28 10:14:14 2013
@@ -21,7 +21,6 @@ package org.apache.uima.ruta.resource;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.Charset;
@@ -60,6 +59,7 @@ public class CSVTable implements RutaTab
List<String> row = Arrays.asList(lineElements);
tableData.add(row);
}
+ sc.close();
}
public RutaWordList getWordList(int index) {
