From e3bfd2f31a7006b7a95e20cd411feed616f79bcd Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Mon, 8 Aug 2011 16:53:54 +0200
Subject: [PATCH] Removing the shutdownHook from the Actor object since we are
 no longer using Configgy and hence no risk of leaks thereof

---
 .../src/main/scala/akka/actor/Actor.scala     | 19 +------------------
 .../src/main/scala/akka/util/AkkaLoader.scala |  1 -
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/actor/Actor.scala b/akka-actor/src/main/scala/akka/actor/Actor.scala
index 7fec89b4c2..d00ca86adb 100644
--- a/akka-actor/src/main/scala/akka/actor/Actor.scala
+++ b/akka-actor/src/main/scala/akka/actor/Actor.scala
@@ -162,7 +162,7 @@ object Timeout {
  *
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
-object Actor extends ListenerManagement {
+object Actor {
 
   /**
    * A Receive is a convenience type that defines actor message behavior currently modeled as
@@ -170,23 +170,6 @@ object Actor extends ListenerManagement {
    */
   type Receive = PartialFunction[Any, Unit]
 
-  /**
-   * Add shutdown cleanups
-   */
-  private[akka] lazy val shutdownHook = {
-    val hook = new Runnable {
-      override def run() {
-        // Clear Thread.subclassAudits
-        val tf = classOf[java.lang.Thread].getDeclaredField("subclassAudits")
-        tf.setAccessible(true)
-        val subclassAudits = tf.get(null).asInstanceOf[java.util.Map[_, _]]
-        subclassAudits synchronized { subclassAudits.clear() }
-      }
-    }
-    Runtime.getRuntime.addShutdownHook(new Thread(hook, "akka-shutdown-hook"))
-    hook
-  }
-
   private[actor] val actorRefInCreation = new ThreadLocal[Stack[ActorRef]] {
     override def initialValue = Stack[ActorRef]()
   }
diff --git a/akka-actor/src/main/scala/akka/util/AkkaLoader.scala b/akka-actor/src/main/scala/akka/util/AkkaLoader.scala
index 7057ecc561..d3ff9bce32 100644
--- a/akka-actor/src/main/scala/akka/util/AkkaLoader.scala
+++ b/akka-actor/src/main/scala/akka/util/AkkaLoader.scala
@@ -38,7 +38,6 @@ class AkkaLoader {
       println("Shutting down Akka...")
       _bundles.foreach(_.onUnload)
       _bundles = None
-      Actor.shutdownHook.run
       println("Akka succesfully shut down")
     }
   }