You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by am...@apache.org on 2014/11/13 12:49:46 UTC
[19/50] incubator-lens git commit: Fix NPE in stop() when init() fails
Fix NPE in stop() when init() fails
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/e71126cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/e71126cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/e71126cf
Branch: refs/heads/toapache
Commit: e71126cff02347d7926ca59a6555302893343a51
Parents: 480457a
Author: jdhok <ja...@inmobi.com>
Authored: Mon Nov 10 11:17:42 2014 +0530
Committer: jdhok <ja...@inmobi.com>
Committed: Mon Nov 10 11:17:42 2014 +0530
----------------------------------------------------------------------
.../src/main/java/org/apache/lens/server/LensServices.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/e71126cf/lens-server/src/main/java/org/apache/lens/server/LensServices.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/LensServices.java b/lens-server/src/main/java/org/apache/lens/server/LensServices.java
index cf3b21c..f345b72 100644
--- a/lens-server/src/main/java/org/apache/lens/server/LensServices.java
+++ b/lens-server/src/main/java/org/apache/lens/server/LensServices.java
@@ -46,7 +46,7 @@ import org.apache.lens.server.stats.StatisticsService;
import org.apache.lens.server.user.UserConfigLoaderFactory;
/**
- * The Class LensServices.
+ * Manage lifecycle of all Lens services
*/
public class LensServices extends CompositeService implements ServiceProvider {
@@ -313,7 +313,11 @@ public class LensServices extends CompositeService implements ServiceProvider {
for (LensService service : lensServices) {
service.prepareStopping();
}
- timer.cancel();
+
+ if (timer != null) {
+ timer.cancel();
+ }
+
try {
// persist all the services
persistLensServiceState();