From 6e22dfc2886b2ed8fbab78948b30bd5bae03f716 Mon Sep 17 00:00:00 2001
From: Mikhail Medvedev <v.mikhail.medvedev@reddict.com>
Date: Thu, 18 Mar 2021 18:15:40 +0400
Subject: [PATCH] Fix null check

---
 .../examples/complete/datatokenization/DataTokenization.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/java/src/main/java/org/apache/beam/examples/complete/datatokenization/DataTokenization.java b/examples/java/src/main/java/org/apache/beam/examples/complete/datatokenization/DataTokenization.java
index 6c6690f1eb35f..355140c97fc73 100644
--- a/examples/java/src/main/java/org/apache/beam/examples/complete/datatokenization/DataTokenization.java
+++ b/examples/java/src/main/java/org/apache/beam/examples/complete/datatokenization/DataTokenization.java
@@ -55,6 +55,7 @@
 import org.apache.beam.sdk.values.Row;
 import org.apache.beam.sdk.values.TupleTag;
 import org.apache.beam.sdk.values.TypeDescriptors;
+import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -275,7 +276,7 @@ public static PipelineResult run(DataTokenizationOptions options) {
                   .via(
                       (Row errRow) ->
                           FailsafeElement.of(errRow.getString("line"), errRow.getString("line"))
-                              .setErrorMessage(errRow.getString("err"))))
+                              .setErrorMessage(Strings.nullToEmpty(errRow.getString("err")))))
           .apply(
               "WriteCsvConversionErrorsToFS",
               ErrorConverters.WriteStringMessageErrorsAsCsv.newBuilder()