You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2018/11/30 09:14:18 UTC
svn commit: r1847792 -
/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TreeWordList.java
Author: pkluegl
Date: Fri Nov 30 09:14:18 2018
New Revision: 1847792
URL: http://svn.apache.org/viewvc?rev=1847792&view=rev
Log:
UIMA-5775 - applied patch
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TreeWordList.java
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TreeWordList.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TreeWordList.java?rev=1847792&r1=1847791&r2=1847792&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TreeWordList.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/resource/TreeWordList.java Fri Nov 30 09:14:18 2018
@@ -263,10 +263,10 @@ public class TreeWordList implements Rut
result |= recursiveContains(pointer, text, next, ignoreCase, fragment, ignoreChars,
maxIgnoreChars, ignoreWS);
} else {
- result |= recursiveContains(childNodeL, text, next, ignoreCase, fragment, ignoreChars,
- maxIgnoreChars, ignoreWS)
- | recursiveContains(childNodeU, text, next, ignoreCase, fragment, ignoreChars,
- maxIgnoreChars, ignoreWS);
+ result |= recursiveContains(childNodeL, text, next, ignoreCase, fragment, ignoreChars, maxIgnoreChars, ignoreWS);
+ if (childNodeL != childNodeU) { // Do not go into the same tree.
+ result |= recursiveContains(childNodeU, text, next, ignoreCase, fragment, ignoreChars, maxIgnoreChars, ignoreWS);
+ }
}
} else {
TextNode wsNode = pointer.getChildNode(' ');