Merge "Add daemon instance to Jython shell session"
diff --git a/Documentation/dev-inspector.txt b/Documentation/dev-inspector.txt
index 925f74c..14177f8 100644
--- a/Documentation/dev-inspector.txt
+++ b/Documentation/dev-inspector.txt
@@ -180,11 +180,8 @@
"schk" is "com.google.gerrit.server.schema.SchemaVersionCheck@5e8cb9bd"
"ds" is "com.google.gerrit.server.schema.DataSourceProvider@6b3592c"
"m" is "com.google.gerrit.lifecycle.LifecycleManager@6f03b248"
-"q" is "com.google.gerrit.reviewdb.server.ReviewDb_Schema_GwtOrm$$23@56d3384d"
"Shell" is "com.google.gerrit.pgm.shell.JythonShell@61644f2d"
-"x" is "com.google.gerrit.reviewdb.client.PatchLineComment@518acfa7"
-"z" is "com.google.gwtorm.jdbc.Database@668dfd9b"
-"db" is "com.google.gerrit.reviewdb.server.ReviewDb_Schema_GwtOrm$$23@6a3ccb09"
+"d" is "com.google.gerrit.pgm.Daemon@28a3f689"
Welcome to the Gerrit Inspector
Enter help() to see the above again, EOF to quit and stop Gerrit
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
index 9c28135..aee16da 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
@@ -227,6 +227,7 @@
shell.set("m", manager);
shell.set("ds", dbInjector.getInstance(DataSourceProvider.class));
shell.set("schk", dbInjector.getInstance(SchemaVersionCheck.class));
+ shell.set("d", this);
shell.run();
} else {
RuntimeShutdown.waitFor();