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/09 16:02:27 UTC
svn commit: r1768994 -
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/MultiThreadUtils.java
Author: schor
Date: Wed Nov 9 16:02:27 2016
New Revision: 1768994
URL: http://svn.apache.org/viewvc?rev=1768994&view=rev
Log:
[UIMA-5176] fix logic bug in multi-thread test util (merge from trunk)
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/MultiThreadUtils.java (contents, props changed)
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/MultiThreadUtils.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/MultiThreadUtils.java?rev=1768994&r1=1768993&r2=1768994&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/MultiThreadUtils.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/MultiThreadUtils.java Wed Nov 9 16:02:27 2016
@@ -166,6 +166,9 @@ public class MultiThreadUtils extends Te
while (true) {
synchronized (threadState[finalI]) {
+ if (threadState[finalI][0] == ThreadControl.TERMINATE) {
+ return;
+ }
while (threadState[finalI][0] == ThreadControl.WAIT) {
try {
threadState[finalI].wait();
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/MultiThreadUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Nov 9 16:02:27 2016
@@ -0,0 +1,7 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/java/org/apache/uima/internal/util/MultiThreadUtils.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/test/java/org/apache/uima/internal/util/MultiThreadUtils.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/test/java/org/apache/uima/internal/util/MultiThreadUtils.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/test/java/org/apache/uima/internal/util/MultiThreadUtils.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/test/java/org/apache/uima/internal/util/MultiThreadUtils.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/java/org/apache/uima/internal/util/MultiThreadUtils.java:933273-944396
+/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/MultiThreadUtils.java:1690273-1768993