commit 32b53b6db40849cca8ebbadb9e7fbd6e5e9ac036
author Dave Borowitz <dborowitz@google.com> Mon Oct 14 16:01:58 2013 -0700
committer Dave Borowitz <dborowitz@google.com> Mon Oct 14 16:01:58 2013 -0700
tree 8c8bfaf1f6b6fc73893ac6c89fe7414ad7cfd6be
parent 7a2d8d4e6167217d232e698d055725412496a677

AbstractQueryChangesTest: avoid possible NPEs on teardown

Change-Id: I517c77fca3a3a40767137296dc55d129855af809

gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java

diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
index e89e3fe..9829c98 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
@@ -118,9 +118,13 @@
 
   @After
   public void tearDownInjector() {
-    lifecycle.stop();
+    if (lifecycle != null) {
+      lifecycle.stop();
+    }
     requestContext.setContext(null);
-    db.close();
+    if (db != null) {
+      db.close();
+    }
     InMemoryDatabase.drop(schemaFactory);
   }