TBR core:veyron/runtimes/google/rt: Runtime should add the reserved name dispatcher to NewContexts.
There are now some callers to RuntimeX.NewServer which requires the reserved name
dispatcher be attached to the context. This broke the veyron integration tests.
Change-Id: I522e2948ab625f73f86b915c7bf507556887f5ff
diff --git a/runtimes/google/rt/runtimex.go b/runtimes/google/rt/runtimex.go
index 9f327f0..8a2e4a0 100644
--- a/runtimes/google/rt/runtimex.go
+++ b/runtimes/google/rt/runtimex.go
@@ -50,6 +50,8 @@
// be replaced by RuntimeX.Init()
// TODO(mattr): Remove this after the runtime->runtimex transistion.
func (rt *vrt) initRuntimeXContext(ctx *context.T) *context.T {
+ ctx = context.WithValue(ctx, reservedNameKey,
+ &reservedNameDispatcher{rt.reservedDisp, rt.reservedOpts})
ctx = context.WithValue(ctx, streamManagerKey, rt.sm[0])
ctx = context.WithValue(ctx, clientKey, rt.client)
ctx = context.WithValue(ctx, namespaceKey, rt.ns)
