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 js...@apache.org on 2015/10/05 12:23:45 UTC

svn commit: r1706784 - /jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/CliUtils.java

Author: jsedding
Date: Mon Oct  5 10:23:45 2015
New Revision: 1706784

URL: http://svn.apache.org/viewvc?rev=1706784&view=rev
Log:
OAK-3473 - CliUtils#handleSigInt uses classes from sun.misc.*

- use Runtime#addShutdownHook() instead

Modified:
    jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/CliUtils.java

Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/CliUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/CliUtils.java?rev=1706784&r1=1706783&r2=1706784&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/CliUtils.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/CliUtils.java Mon Oct  5 10:23:45 2015
@@ -32,8 +32,6 @@ import com.google.common.io.Closer;
 
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
-import sun.misc.Signal;
-import sun.misc.SignalHandler;
 
 @SuppressWarnings("restriction")
 public class CliUtils {
@@ -80,18 +78,16 @@ public class CliUtils {
     }
 
     public static void handleSigInt(final Closer closer) {
-        SignalHandler handler = new SignalHandler() {
+        Runtime.getRuntime().addShutdownHook(new Thread() {
             @Override
-            public void handle(Signal signal) {
+            public void run() {
                 try {
                     closer.close();
                 } catch (IOException e) {
                     log.error("Can't close", e);
                 }
-                System.exit(0);
             }
-        };
-        Signal.handle(new Signal("INT"), handler);
+        });
     }
 
     public static void backupOldJcr2Files(String repositoryDirPath) {