1 files changed, 29 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/server/signal/InterruptSignalHandler.java b/src/main/java/com/google/devtools/build/lib/server/signal/InterruptSignalHandler.java
index f2dc729cef..74196e2caa 100644
--- a/src/main/java/com/google/devtools/build/lib/server/signal/InterruptSignalHandler.java
+++ b/src/main/java/com/google/devtools/build/lib/server/signal/InterruptSignalHandler.java
@@ -13,18 +13,44 @@
 // limitations under the License.
 package com.google.devtools.build.lib.server.signal;
 
+import com.google.devtools.build.lib.util.Preconditions;
 import sun.misc.Signal;
+import sun.misc.SignalHandler;
+
+/**
+ * A facade around sun.misc.Signal providing special-purpose SIGINT handling.
+ *
+ * <p>We use this code in preference to using sun.misc directly since the latter is deprecated, and
+ * depending on it causes the jdk1.6 javac to emit an unsuppressable warning that sun.misc is
+ * "Sun proprietary API and may be removed in a future release".
+ */
+public abstract class InterruptSignalHandler implements Runnable {
 
-/** Class that can be extended to handle SIGINT in a custom way. */
-public abstract class InterruptSignalHandler extends AbstractSignalHandler {
   private static final Signal SIGINT = new Signal("INT");
 
+  private SignalHandler oldHandler;
+
   /**
    * Constructs an InterruptSignalHandler instance.  Until the uninstall()
    * method is invoked, the delivery of a SIGINT signal to this process will
    * cause the run() method to be invoked in another thread.
    */
   protected InterruptSignalHandler() {
-    super(SIGINT);
+    this.oldHandler =
+        Signal.handle(
+            SIGINT,
+            new SignalHandler() {
+              @Override
+              public void handle(Signal signal) {
+                run();
+              }
+            });
+  }
+
+  /** Disables SIGINT handling. */
+  public final synchronized void uninstall() {
+    Preconditions.checkNotNull(oldHandler, "uninstall() already called");
+    Signal.handle(SIGINT, oldHandler);
+    oldHandler = null;
   }
 }