AbstractQueryChangesTest: avoid possible NPEs on teardown

Change-Id: I517c77fca3a3a40767137296dc55d129855af809
2013-10-14 16:01:58 -07:00
parent 7a2d8d4e61
commit 32b53b6db4
1 changed files with 6 additions and 2 deletions
--- 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 @@ public abstract class AbstractQueryChangesTest {

  @After
  public void tearDownInjector() {
-    lifecycle.stop();
+    if (lifecycle != null) {
+      lifecycle.stop();
+    }
    requestContext.setContext(null);
-    db.close();
+    if (db != null) {
+      db.close();
+    }
    InMemoryDatabase.drop(schemaFactory);
  }