BACKLOG-22955 : Create daemon threads for CarteStatusCache (pentaho#5293

)

Use daemon threads to avoid blocking shutdown

engine/src/main/java/org/pentaho/di/www/cache/CarteStatusCache.java

@@ -2,7 +2,7 @@
  *
  * Pentaho Data Integration
  *
- * Copyright (C) 2002-2017 by Hitachi Vantara : http://www.pentaho.com
+ * Copyright (C) 2002-2018 by Hitachi Vantara : http://www.pentaho.com
  *
  *******************************************************************************
  *
@@ -36,14 +36,26 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 
 
 public class CarteStatusCache implements Cache {
 
   public static final String CARTE_STATUS_CACHE = "CARTE_CACHE";
 
-  private final ScheduledExecutorService removeService = Executors.newSingleThreadScheduledExecutor();
+  /**
+   * Switching the thread launched to be daemon otherwise it blocks the pentaho server shutdown
+   */
+  private final ScheduledExecutorService removeService = Executors.newSingleThreadScheduledExecutor(
+    new ThreadFactory() {
+      public Thread newThread( Runnable r ) {
+        Thread t = Executors.defaultThreadFactory().newThread( r );
+        t.setDaemon( true );
+        t.setName( CarteStatusCache.class.getSimpleName() );
+        return t;
+      }
+    } );
 
   private final Map<String, CachedItem> cachedMap = new ConcurrentHashMap<>();
 
@@ -53,7 +65,6 @@ public class CarteStatusCache implements Cache {
 
   private TimeUnit timeUnit = null;
 
-
   public static synchronized CarteStatusCache getInstance() {
     if ( instance == null ) {
       instance = new CarteStatusCache();
@@ -64,6 +75,7 @@ public static synchronized CarteStatusCache getInstance() {
   private CarteStatusCache() {
     period = Integer.parseInt( Const.getEnvironmentVariable( "CARTE_CLEAR_PERIOD", "1" ) );
     timeUnit = TimeUnit.valueOf( Const.getEnvironmentVariable( "CARTE_CLEAR_TIMEUNIT", "DAYS" ) );
+
     removeService.scheduleAtFixedRate( this::clear, 1, 1, TimeUnit.DAYS );
   }