You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by da...@apache.org on 2015/05/12 14:37:23 UTC

svn commit: r1678922 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java

Author: davide
Date: Tue May 12 12:37:22 2015
New Revision: 1678922

URL: http://svn.apache.org/r1678922
Log:
OAK-2854 - provide more insight on executors during shutdown

- reissued the thread interrupt.

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java?rev=1678922&r1=1678921&r2=1678922&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java Tue May 12 12:37:22 2015
@@ -689,6 +689,7 @@ public class Oak {
                 executorService.awaitTermination(5, TimeUnit.SECONDS);
             } catch (InterruptedException e) {
                 LOG.error("Error while shutting down the executorService", e);
+                Thread.currentThread().interrupt();
             } finally {
                 if (!executorService.isTerminated()) {
                     LOG.warn("executorService didn't shutdown properly. Will be forced now.");