svn commit: r1709853 - /uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java

[pk...@apache.org]

Author: pkluegl
Date: Wed Oct 21 14:41:53 2015
New Revision: 1709853

URL: http://svn.apache.org/viewvc?rev=1709853&view=rev
Log:
UIMA-4613
- avoid NPE for template descriptor import

Modified:
    uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java

Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java?rev=1709853&r1=1709852&r2=1709853&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java Wed Oct 21 14:41:53 2015
@@ -71,7 +71,6 @@ import org.apache.uima.ruta.extensions.R
 import org.apache.uima.ruta.parser.RutaLexer;
 import org.apache.uima.ruta.parser.RutaParser;
 import org.apache.uima.ruta.seed.RutaAnnotationSeeder;
-import org.apache.uima.ruta.type.RutaBasic;
 import org.apache.uima.ruta.verbalize.RutaVerbalizer;
 import org.apache.uima.ruta.visitor.CreatedByVisitor;
 import org.apache.uima.ruta.visitor.DebugInfoCollectorVisitor;
@@ -725,7 +724,7 @@ public class RutaEngine extends JCasAnno
       } catch (RecognitionException e) {
         throw new AnalysisEngineProcessException(e);
       }
-    } else if(mainScript != null) {
+    } else if (mainScript != null) {
       String scriptLocation = locate(mainScript, scriptPaths, SCRIPT_FILE_EXTENSION);
       if (scriptLocation == null) {
         try {
@@ -750,10 +749,10 @@ public class RutaEngine extends JCasAnno
         }
       }
     }
-    if(script == null) {
+    if (script == null) {
       return;
     }
-    
+
     Map<String, RutaModule> additionalScriptsMap = new HashMap<String, RutaModule>();
     Map<String, AnalysisEngine> additionalEnginesMap = new HashMap<String, AnalysisEngine>();
 
@@ -1131,18 +1130,22 @@ public class RutaEngine extends JCasAnno
   @Override
   public void batchProcessComplete() throws AnalysisEngineProcessException {
     super.batchProcessComplete();
-    Collection<AnalysisEngine> values = script.getEngines().values();
-    for (AnalysisEngine each : values) {
-      each.batchProcessComplete();
+    if (script != null) {
+      Collection<AnalysisEngine> values = script.getEngines().values();
+      for (AnalysisEngine each : values) {
+        each.batchProcessComplete();
+      }
     }
   }
 
   @Override
   public void collectionProcessComplete() throws AnalysisEngineProcessException {
     super.collectionProcessComplete();
-    Collection<AnalysisEngine> values = script.getEngines().values();
-    for (AnalysisEngine each : values) {
-      each.collectionProcessComplete();
+    if (script != null) {
+      Collection<AnalysisEngine> values = script.getEngines().values();
+      for (AnalysisEngine each : values) {
+        each.collectionProcessComplete();
+      }
     }
   }