Index: impl/prod/context.go |
diff --git a/impl/prod/context.go b/impl/prod/context.go |
index 983b06b01018a0c753aeb68b80428ed9cf768c1f..96bea791b1cab296c2c09fefd9dc94716cc8122e 100644 |
--- a/impl/prod/context.go |
+++ b/impl/prod/context.go |
@@ -57,9 +57,13 @@ func AEContextNoTxn(c context.Context) context.Context { |
if aeCtx == nil { |
return nil |
} |
- aeCtx, err := appengine.Namespace(aeCtx, info.Get(c).GetNamespace()) |
- if err != nil { |
- panic(err) |
+ |
+ if ns, has := info.Get(c).GetNamespace(); has { |
+ var err error |
+ aeCtx, err = appengine.Namespace(aeCtx, ns) |
+ if err != nil { |
+ panic(err) |
+ } |
} |
if deadline, ok := c.Deadline(); ok { |
aeCtx, _ = context.WithDeadline(aeCtx, deadline) |