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 2016/10/05 11:30:44 UTC
svn commit: r1763428 - in
/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta:
action/MarkFastAction.java condition/InListCondition.java
Author: pkluegl
Date: Wed Oct 5 11:30:44 2016
New Revision: 1763428
URL: http://svn.apache.org/viewvc?rev=1763428&view=rev
Log:
no jira - avoid NPE
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkFastAction.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/InListCondition.java
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkFastAction.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkFastAction.java?rev=1763428&r1=1763427&r2=1763428&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkFastAction.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/action/MarkFastAction.java Wed Oct 5 11:30:44 2016
@@ -78,7 +78,6 @@ public class MarkFastAction extends Abst
for (AnnotationFS annotationFS : matchedAnnotationsOf) {
RutaStream windowStream = stream.getWindowStream(annotationFS, annotationFS.getType());
RutaWordList wl = null;
- element.getParent();
if (list != null) {
wl = list.getList(context, stream);
} else if (stringList != null) {
Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/InListCondition.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/InListCondition.java?rev=1763428&r1=1763427&r2=1763428&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/InListCondition.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/InListCondition.java Wed Oct 5 11:30:44 2016
@@ -63,7 +63,11 @@ public class InListCondition extends Ter
}
if (stringList == null) {
RutaWordList wordList = listExpr.getList(context, stream);
- return new EvaluatedCondition(this, wordList.contains(text, false, 0, null, 0, true));
+ boolean contains = false;
+ if(wordList != null) {
+ contains = wordList.contains(text, false, 0, null, 0, true);
+ }
+ return new EvaluatedCondition(this, contains);
}
List<String> sList = stringList.getList(context, stream);
boolean contains = sList.contains(text);