You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2016/11/15 21:36:18 UTC
svn commit: r1769885 -
/uima/uimaj/branches/experiment-v3-jcas/uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas/MigrateJCas.java
Author: schor
Date: Tue Nov 15 21:36:17 2016
New Revision: 1769885
URL: http://svn.apache.org/viewvc?rev=1769885&view=rev
Log:
[UIMA-4518] migration tool - reset pear/jar env after processing
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas/MigrateJCas.java
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas/MigrateJCas.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas/MigrateJCas.java?rev=1769885&r1=1769884&r2=1769885&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas/MigrateJCas.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-v3migration-jcas/src/main/java/org/apache/uima/migratev3/jcas/MigrateJCas.java Tue Nov 15 21:36:17 2016
@@ -1614,7 +1614,12 @@ public class MigrateJCas extends VoidVis
stream.forEachOrdered(
p -> getCandidates_processFile(p, localPearClasspath));
}
- jar_current_stack.pop();
+ if (isJar) {
+ jar_current_stack.pop();
+ }
+ if (isPear) {
+ pear_current = null;
+ }
} else {
// is not a .jar or .pear file. add .java or .class files to initial candidate set
// will be filtered additionally later