From 51715dbcdb65b573633011e0f2e9746d1f324988 Mon Sep 17 00:00:00 2001
From: Jan Bartel
Date: Thu, 4 Sep 2014 11:31:08 +1000
Subject: 443231 java.lang.NullPointerException on scavenge scheduling when
 session id manager declared before shared scheduler

---
 .../java/org/eclipse/jetty/nosql/mongodb/MongoSessionIdManager.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'jetty-nosql')

diff --git a/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionIdManager.java b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionIdManager.java
index e599b27149..18d44061c3 100644
--- a/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionIdManager.java
+++ b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionIdManager.java
@@ -416,7 +416,10 @@ public class MongoSessionIdManager extends AbstractSessionIdManager
                 _scheduler = new ScheduledExecutorScheduler();
                 _ownScheduler = true;
                 _scheduler.start();
-            }
+            }   
+            else if (!_scheduler.isStarted())
+                throw new IllegalStateException("Shared scheduler not started");
+            
 
             //setup the scavenger thread
             if (_scavengePeriod > 0)
-- 
cgit v1.2.3