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 2014/05/02 19:56:45 UTC
svn commit: r1591987 -
/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasHashMap.java
Author: schor
Date: Fri May 2 17:56:45 2014
New Revision: 1591987
URL: http://svn.apache.org/r1591987
Log:
[UIMA-3798] fix race condition causing hangs
Modified:
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasHashMap.java
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasHashMap.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasHashMap.java?rev=1591987&r1=1591986&r2=1591987&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasHashMap.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasHashMap.java Fri May 2 17:56:45 2014
@@ -336,6 +336,12 @@ public class JCasHashMap {
if (localTable != table) { // redo search from top, because table resized
resetProbeInfo(probeInfo);
}
+ // re acquire the FeatureStructure m, because another thread could change it before the lock got acquired
+ m = localTable[probeInfo[PROBE_ADDR_INDEX]];
+ if (isReal(m)) {
+ return m; // another thread snuck in before the lock and switched this
+ }
+
// note: localTable not used from this point, unless reset
if (isReal(m = find(key, hash, probeInfo))) {