Merge pull request #29231 Avoid potential null pointer exceptions in …

…logging.
apache · Nov 1, 2023 · afc499f · afc499f
2 parents 92a1a45 + 9101dc1
commit afc499f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/logging/BeamFnLoggingClient.java b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/logging/BeamFnLoggingClient.java
@@ -408,11 +408,15 @@ public void publish(LogRecord record) {
       if (severity == null) {
         return;
       }
+      if (record == null) {
+        return;
+      }
+      String messageString = getFormatter().formatMessage(record);
 
       BeamFnApi.LogEntry.Builder builder =
           BeamFnApi.LogEntry.newBuilder()
               .setSeverity(severity)
-              .setMessage(getFormatter().formatMessage(record))
+              .setMessage(messageString == null ? "null" : messageString)
               .setThread(Integer.toString(record.getThreadID()))
               .setTimestamp(
                   Timestamp.newBuilder()