From 1dc64fe47a84f28ff31d95d40cf91a7022dba853 Mon Sep 17 00:00:00 2001
From: Jeff Schnitzer <jeff@infohazard.org>
Date: Wed, 5 Oct 2022 13:39:05 -0700
Subject: [PATCH] If namespace is null, don't add any fuss to the generated
 legacy key

Preserves behavior with older generated legacy keys
---
 src/main/java/com/googlecode/objectify/util/KeyFormat.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/googlecode/objectify/util/KeyFormat.java b/src/main/java/com/googlecode/objectify/util/KeyFormat.java
index 84f56cc44..8e85001f1 100644
--- a/src/main/java/com/googlecode/objectify/util/KeyFormat.java
+++ b/src/main/java/com/googlecode/objectify/util/KeyFormat.java
@@ -164,7 +164,9 @@ public String formatOldStyleAppEngineKey(Key key) {
             fullProjectId = "s~" + fullProjectId;
         }
         keyMessageBuilder.setField(referenceDescriptor.findFieldByName("app"), fullProjectId);
-        keyMessageBuilder.setField(referenceDescriptor.findFieldByName("name_space"), key.getNamespace());
+        if (key.getNamespace() != null) {
+            keyMessageBuilder.setField(referenceDescriptor.findFieldByName("name_space"), key.getNamespace());
+        }
         Descriptors.Descriptor elementDescriptor = keyDescriptor.findMessageTypeByName("Element");
 
         List<DynamicMessage> elementMessages = new ArrayList<>();