From 567fdf048fee49afc86ca5d7d35f55424a6016ba Mon Sep 17 00:00:00 2001
From: Maciej Szwaja <mszwaja@google.com>
Date: Mon, 16 Mar 2026 09:11:14 -0700
Subject: [PATCH] fix: fix null handling in runAsyncImpl

PiperOrigin-RevId: 884472852
---
 .../java/com/google/adk/runner/Runner.java    | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/com/google/adk/runner/Runner.java b/core/src/main/java/com/google/adk/runner/Runner.java
index 29b2b76d3..5859c4786 100644
--- a/core/src/main/java/com/google/adk/runner/Runner.java
+++ b/core/src/main/java/com/google/adk/runner/Runner.java
@@ -458,6 +458,9 @@ protected Flowable<Event> runAsyncImpl(
       Content newMessage,
       RunConfig runConfig,
       @Nullable Map<String, Object> stateDelta) {
+    Preconditions.checkNotNull(session, "session cannot be null");
+    Preconditions.checkNotNull(newMessage, "newMessage cannot be null");
+    Preconditions.checkNotNull(runConfig, "runConfig cannot be null");
     return Flowable.defer(
             () -> {
               BaseAgent rootAgent = this.agent;
@@ -476,19 +479,14 @@ protected Flowable<Event> runAsyncImpl(
                   .defaultIfEmpty(newMessage)
                   .flatMap(
                       content ->
-                          (content != null)
-                              ? appendNewMessageToSession(
-                                  session,
-                                  content,
-                                  initialContext,
-                                  runConfig.saveInputBlobsAsArtifacts(),
-                                  stateDelta)
-                              : Single.just(null))
+                          appendNewMessageToSession(
+                              session,
+                              content,
+                              initialContext,
+                              runConfig.saveInputBlobsAsArtifacts(),
+                              stateDelta))
                   .flatMapPublisher(
                       event -> {
-                        if (event == null) {
-                          return Flowable.empty();
-                        }
                         // Get the updated session after the message and state delta are
                         // applied
                         return this.sessionService