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 2019/05/31 13:34:09 UTC

svn commit: r1860445 - /uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/AnnotationTypeExpression.java

Author: pkluegl
Date: Fri May 31 13:34:09 2019
New Revision: 1860445

URL: http://svn.apache.org/viewvc?rev=1860445&view=rev
Log:
UIMA-6050 - avoid SO for broken expression

Modified:
    uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/AnnotationTypeExpression.java

Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/AnnotationTypeExpression.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/AnnotationTypeExpression.java?rev=1860445&r1=1860444&r2=1860445&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/AnnotationTypeExpression.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/AnnotationTypeExpression.java Fri May 31 13:34:09 2019
@@ -111,7 +111,9 @@ public class AnnotationTypeExpression ex
       } else {
         Type type = getType(context, stream);
         types = new ArrayList<>(1);
-        types.add(type);
+        if (type != null) {
+          types.add(type);
+        }
       }
       for (Type type : types) {
 
@@ -165,6 +167,12 @@ public class AnnotationTypeExpression ex
     if (!initialized) {
       initialize(context, stream);
     }
+
+    if (typeExpression == null && typeListExpression == null && annotationExpression == null
+            && annotationListExpression == null) {
+      return null;
+    }
+
     if (typeExpression != null) {
       return typeExpression.getType(context, stream);
     } else {