You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by vm...@apache.org on 2019/05/15 16:26:31 UTC
svn commit: r1859298 - /uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/RutaVerbalizer.java

Author: vmorari
Date: Wed May 15 16:26:31 2019
New Revision: 1859298

URL: http://svn.apache.org/viewvc?rev=1859298&view=rev
Log:
HD-6029: added NPE check in verbalization

Modified:
    uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/RutaVerbalizer.java

Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/RutaVerbalizer.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/RutaVerbalizer.java?rev=1859298&r1=1859297&r2=1859298&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/RutaVerbalizer.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/RutaVerbalizer.java Wed May 15 16:26:31 2019
@@ -67,21 +67,24 @@ public class RutaVerbalizer {
   }
 
   public String verbalize(Object element) {
-    if (externalVerbalizers.keySet().contains(element.getClass()) && element instanceof RutaElement) {
-      return externalVerbalizers.get(element.getClass()).verbalize((RutaElement) element, this);
-    } else if (element instanceof AbstractRutaAction) {
-      return actionVerbalizer.verbalize((AbstractRutaAction) element);
-    } else if (element instanceof AbstractRutaCondition) {
-      return conditionVerbalizer.verbalize((AbstractRutaCondition) element);
-    } else if (element instanceof IRutaExpression) {
-      return expressionVerbalizer.verbalize((RutaExpression) element);
-    } else if (element instanceof RutaBlock) {
-      return verbalize((RutaBlock) element, false);
-    } else if (element instanceof RutaElement) {
-      return scriptVerbalizer.verbalize((RutaElement) element);
-    } else {
-      return element.getClass().getSimpleName();
+    if (element != null) {
+      if (externalVerbalizers.keySet().contains(element.getClass()) && element instanceof RutaElement) {
+        return externalVerbalizers.get(element.getClass()).verbalize((RutaElement) element, this);
+      } else if (element instanceof AbstractRutaAction) {
+        return actionVerbalizer.verbalize((AbstractRutaAction) element);
+      } else if (element instanceof AbstractRutaCondition) {
+        return conditionVerbalizer.verbalize((AbstractRutaCondition) element);
+      } else if (element instanceof IRutaExpression) {
+        return expressionVerbalizer.verbalize((RutaExpression) element);
+      } else if (element instanceof RutaBlock) {
+        return verbalize((RutaBlock) element, false);
+      } else if (element instanceof RutaElement) {
+        return scriptVerbalizer.verbalize((RutaElement) element);
+      } else {
+        return element.getClass().getSimpleName();
+      }
     }
+    return "";
   }
 
   public String verbalizeName(RutaElement element) {