You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2015/04/23 17:39:56 UTC
svn commit: r1675645 -
/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java
Author: pkluegl
Date: Thu Apr 23 15:39:56 2015
New Revision: 1675645
URL: http://svn.apache.org/r1675645
Log:
UIMA-4287
- avoid NPE for missing input dir
Modified:
uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java
Modified: uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java?rev=1675645&r1=1675644&r2=1675645&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java (original)
+++ uima/ruta/trunk/ruta-ep-ide-ui/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java Thu Apr 23 15:39:56 2015
@@ -46,7 +46,7 @@ import org.xml.sax.SAXException;
public class RutaLauncher {
public static final String URL_ENCODING = "UTF-8";
-
+
private static File descriptor;
private static File inputFolder;
@@ -120,7 +120,8 @@ public class RutaLauncher {
throw new IllegalArgumentException("Passed arguments are invalid!");
}
- AnalysisEngine ae = Ruta.wrapAnalysisEngine(descriptor.toURI().toURL(), view, true, inputEncoding);
+ AnalysisEngine ae = Ruta.wrapAnalysisEngine(descriptor.toURI().toURL(), view, true,
+ inputEncoding);
configure(ae);
CAS cas = ae.newCAS();
@@ -187,15 +188,18 @@ public class RutaLauncher {
private static List<File> getFiles(File dir, boolean recusive) {
List<File> result = new ArrayList<File>();
- for (File each : dir.listFiles()) {
- // TODO: find a solution for this hotfix
- if (each.isHidden()) {
- continue;
- }
- if (each.isFile()) {
- result.add(each);
- } else if (each.isDirectory() && recusive) {
- result.addAll(getFiles(each, recusive));
+ File[] listFiles = dir.listFiles();
+ if (listFiles != null) {
+ for (File each : listFiles) {
+ // TODO: find a solution for this hotfix
+ if (each.isHidden()) {
+ continue;
+ }
+ if (each.isFile()) {
+ result.add(each);
+ } else if (each.isDirectory() && recusive) {
+ result.addAll(getFiles(each, recusive));
+ }
}
}
return result;