Fix to https://issues.apache.org/jira/browse/WAVE-415
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/5b19ee5e Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/5b19ee5e Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/5b19ee5e Branch: refs/heads/fulltextsearch Commit: 5b19ee5ea45baf41a1a2cb9cfdcd5b6277dc5b49 Parents: bf6b200 Author: Andrew Kaplanov <[email protected]> Authored: Thu Aug 14 00:15:35 2014 +0600 Committer: Andrew Kaplanov <[email protected]> Committed: Thu Aug 14 00:15:35 2014 +0600 ---------------------------------------------------------------------- src/org/waveprotocol/box/stat/AsyncCallContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/5b19ee5e/src/org/waveprotocol/box/stat/AsyncCallContext.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/stat/AsyncCallContext.java b/src/org/waveprotocol/box/stat/AsyncCallContext.java index 5243415..cc0e00a 100644 --- a/src/org/waveprotocol/box/stat/AsyncCallContext.java +++ b/src/org/waveprotocol/box/stat/AsyncCallContext.java @@ -58,7 +58,7 @@ public class AsyncCallContext { * Enters to cloned scope and stop timer. */ public void stop() { - if (timer.isActive()) { + if (timer != null && timer.isActive()) { Timing.enterScope(values); Timing.stop(timer); }
