From 4c4e234279d764c49214593f8da33edf83fbcd54 Mon Sep 17 00:00:00 2001
From: Christian Tzolov <ctzolov@vmware.com>
Date: Sat, 3 Feb 2024 15:34:41 +0100
Subject: [PATCH] Fix ollama embedding options merging bug

---
 .../springframework/ai/ollama/OllamaEmbeddingClient.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/OllamaEmbeddingClient.java b/models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/OllamaEmbeddingClient.java
index 72d82d969..78b2f258a 100644
--- a/models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/OllamaEmbeddingClient.java
+++ b/models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/OllamaEmbeddingClient.java
@@ -122,9 +122,11 @@ public class OllamaEmbeddingClient extends AbstractEmbeddingClient {
 			if (options instanceof OllamaOptions ollamaOptions) {
 				runtimeOptions = ollamaOptions;
 			}
-			// currently EmbeddingOptions does not have any portable options to be
-			// merged.
-			runtimeOptions = null;
+			else {
+				// currently EmbeddingOptions does not have any portable options to be
+				// merged.
+				runtimeOptions = null;
+			}
 		}
 
 		OllamaOptions mergedOptions = ModelOptionsUtils.merge(runtimeOptions, this.defaultOptions, OllamaOptions.class);