diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-04 20:44:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-04 20:44:01 +0000 |
| commit | fb5a02906f644d044eb0286bf27d413ba0e05216 (patch) | |
| tree | bca7d49005d81d10c70bc3f547df041c636b4300 /plugins/github/test/org/jetbrains/plugins/github/test/GithubTest.java | |
| parent | 9cde0e3c015174898df8b8f3672185941fad4786 (diff) | |
| parent | d245f58efbfc26b13b9b9d5e52e6a83a0d76216c (diff) | |
| download | idea-fb5a02906f644d044eb0286bf27d413ba0e05216.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'plugins/github/test/org/jetbrains/plugins/github/test/GithubTest.java')
| -rw-r--r-- | plugins/github/test/org/jetbrains/plugins/github/test/GithubTest.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/plugins/github/test/org/jetbrains/plugins/github/test/GithubTest.java b/plugins/github/test/org/jetbrains/plugins/github/test/GithubTest.java index 3d3d8201e03a..da64988f5b16 100644 --- a/plugins/github/test/org/jetbrains/plugins/github/test/GithubTest.java +++ b/plugins/github/test/org/jetbrains/plugins/github/test/GithubTest.java @@ -176,7 +176,6 @@ public abstract class GithubTest extends GitPlatformTest { myHttpAuthService = (GitHttpAuthTestService)ServiceManager.getService(GitHttpAuthService.class); - try { beforeTest(); } @@ -197,7 +196,7 @@ public abstract class GithubTest extends GitPlatformTest { afterTest(); } finally { - myHttpAuthService.cleanup(); + if (myHttpAuthService != null) myHttpAuthService.cleanup(); super.tearDown(); } } |