commit 13ff863ae87b4e52bf75729edcf6a16be16c282d
author Peter Klügl <peter.kluegl@averbis.com> Wed Mar 24 12:03:20 2021 +0100
committer Peter Klügl <peter.kluegl@averbis.com> Wed Mar 24 12:03:20 2021 +0100
tree 558212047050dfc160cc9d657d2c294ade028342
parent d49c0c445b6a5e24001ed9580682a2e68b752cb4
parent 8784d502d23db089dcaea3b98b99372622b9ab40

Merge branch 'main' into bugfix/UIMA-6345-RutaBasicUtils-should-not-require-RutaBasic-type

ruta-core/src/main/java/org/apache/uima/ruta/RutaBasicUtils.java

diff --git a/ruta-core/src/main/java/org/apache/uima/ruta/RutaBasicUtils.java b/ruta-core/src/main/java/org/apache/uima/ruta/RutaBasicUtils.java
index f371d49..473f75d 100644
--- a/ruta-core/src/main/java/org/apache/uima/ruta/RutaBasicUtils.java
+++ b/ruta-core/src/main/java/org/apache/uima/ruta/RutaBasicUtils.java
@@ -62,6 +62,11 @@
     CAS cas = annotation.getCAS();
     TypeSystem typeSystem = cas.getTypeSystem();
     Type basicType = typeSystem.getType(RutaBasic.class.getName());
+
+    if (basicType == null) {
+      return false;
+    }
+
     Type type = annotation.getType();
 
     if (typeSystem.subsumes(basicType, type)) {
@@ -107,6 +112,11 @@
     CAS cas = annotation.getCAS();
     TypeSystem typeSystem = cas.getTypeSystem();
     Type basicType = typeSystem.getType(RutaBasic.class.getName());
+
+    if (basicType == null) {
+      return false;
+    }
+
     Type type = annotation.getType();
 
     if (typeSystem.subsumes(basicType, type)) {