svn commit: r1781881 - /uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/pipeline/SimplePipeline.java

[rec]

Author: rec
Date: Mon Feb  6 11:38:49 2017
New Revision: 1781881

URL: http://svn.apache.org/viewvc?rev=1781881&view=rev
Log:
[UIMA-5298] Life-cycle methods not called on all components instantiated by 
uimaFIT
- Also destroy reader created in SimplePipeline
- destroy in a fail-safe way using LifeCycleUtil


Modified:
    
uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/pipeline/SimplePipeline.java

Modified: 
uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/pipeline/SimplePipeline.java
URL: 
http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/pipeline/SimplePipeline.java?rev=1781881&r1=1781880&r2=1781881&view=diff
==============================================================================
--- 
uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/pipeline/SimplePipeline.java
 (original)
+++ 
uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/pipeline/SimplePipeline.java
 Mon Feb  6 11:38:49 2017
@@ -35,6 +35,7 @@ import org.apache.uima.cas.CAS;
 import org.apache.uima.collection.CollectionReader;
 import org.apache.uima.collection.CollectionReaderDescription;
 import org.apache.uima.fit.internal.ResourceManagerFactory;
+import org.apache.uima.fit.util.LifeCycleUtil;
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.resource.Resource;
 import org.apache.uima.resource.ResourceInitializationException;
@@ -99,7 +100,7 @@ public final class SimplePipeline {
       aae.collectionProcessComplete();
     } finally {
       // Destroy
-      aae.destroy();
+      LifeCycleUtil.destroy(aae);
     }
   }
 
@@ -155,7 +156,8 @@ public final class SimplePipeline {
       aae.collectionProcessComplete();
     } finally {
       // Destroy
-      aae.destroy();
+      LifeCycleUtil.destroy(reader);
+      LifeCycleUtil.destroy(aae);
     }
   }
 
@@ -233,7 +235,7 @@ public final class SimplePipeline {
       aae.collectionProcessComplete();
     } finally {
       // Destroy
-      aae.destroy();
+      LifeCycleUtil.destroy(aae);
     }
   }