From 1261fab3af4500ff721496e8fc540de2d40bb70d Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Sun, 22 Jul 2012 15:33:18 +0200
Subject: [PATCH] Removing akka.util.NonFatal and replacing it with
 scala.util.control.NonFatal

---
 .../scala/akka/actor/SupervisorMiscSpec.scala |  2 +-
 .../src/main/scala/akka/actor/ActorCell.scala |  3 +-
 .../scala/akka/actor/ActorRefProvider.scala   |  3 +-
 .../main/scala/akka/actor/ActorSystem.scala   |  1 +
 .../main/scala/akka/actor/DynamicAccess.scala |  2 +-
 akka-actor/src/main/scala/akka/actor/IO.scala |  3 +-
 .../main/scala/akka/actor/TypedActor.scala    |  3 +-
 .../akka/dispatch/AbstractDispatcher.scala    |  8 ++---
 .../main/scala/akka/dispatch/Mailbox.scala    | 12 ++++----
 .../main/scala/akka/pattern/AskSupport.scala  |  5 ++--
 .../scala/akka/pattern/CircuitBreaker.scala   |  3 +-
 .../akka/pattern/FutureTimeoutSupport.scala   | 14 ++++-----
 .../akka/serialization/Serialization.scala    |  2 +-
 .../src/main/scala/akka/util/NonFatal.scala   | 29 -------------------
 .../src/main/scala/akka/util/Reflect.scala    |  1 +
 .../akka/camel/internal/DefaultCamel.scala    |  2 +-
 .../camel/internal/ProducerRegistry.scala     |  2 +-
 .../internal/component/ActorComponent.scala   |  3 +-
 .../code/docs/testkit/TestkitDocSpec.scala    |  2 +-
 .../akka/actor/mailbox/FileBasedMailbox.scala |  2 +-
 .../actor/mailbox/filequeue/Journal.scala     |  2 +-
 .../akka/remote/testkit/MultiNodeSpec.scala   |  7 +++--
 .../main/scala/akka/remote/netty/Client.scala |  3 +-
 .../remote/netty/NettyRemoteSupport.scala     |  2 +-
 .../testkit/CallingThreadDispatcher.scala     |  6 ++--
 .../akka/transactor/FickleFriendsSpec.scala   |  3 +-
 .../akka/zeromq/ConcurrentSocketActor.scala   |  2 +-
 27 files changed, 54 insertions(+), 73 deletions(-)
 delete mode 100644 akka-actor/src/main/scala/akka/util/NonFatal.scala

diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala
index aba3ea1217..54f531752a 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala
@@ -13,7 +13,7 @@ import akka.testkit.AkkaSpec
 import akka.testkit.DefaultTimeout
 import akka.pattern.ask
 import scala.concurrent.util.duration._
-import akka.util.NonFatal
+import scala.util.control.NonFatal
 
 object SupervisorMiscSpec {
   val config = """
diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
index d59baaf6fe..4b120a969e 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
@@ -16,7 +16,8 @@ import java.io.{ NotSerializableException, ObjectOutputStream }
 import akka.serialization.SerializationExtension
 import akka.event.Logging.LogEventException
 import scala.collection.immutable.{ TreeSet, TreeMap }
-import akka.util.{ Unsafe, Helpers, NonFatal }
+import akka.util.{ Unsafe, Helpers }
+import scala.util.control.NonFatal
 import scala.concurrent.util.Duration
 
 //TODO: everything here for current compatibility - could be limited more
diff --git a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
index 6b5f6baeaa..fe9c1bca03 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
@@ -7,7 +7,8 @@ package akka.actor
 import akka.dispatch._
 import akka.routing._
 import akka.event._
-import akka.util.{ NonFatal, Switch, Helpers }
+import akka.util.{ Switch, Helpers }
+import scala.util.control.NonFatal
 import scala.concurrent.{ Future, Promise }
 import java.util.concurrent.atomic.AtomicLong
 
diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
index bf088d4d21..c31c451c44 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
@@ -12,6 +12,7 @@ import scala.annotation.tailrec
 import scala.concurrent.util.Duration
 import java.io.Closeable
 import scala.concurrent.{ Await, Awaitable, CanAwait, Future }
+import scala.util.control.NonFatal
 import akka.util._
 import akka.util.internal.{ HashedWheelTimer, ConcurrentIdentityHashMap }
 import java.util.concurrent.{ ThreadFactory, CountDownLatch, TimeoutException, RejectedExecutionException }
diff --git a/akka-actor/src/main/scala/akka/actor/DynamicAccess.scala b/akka-actor/src/main/scala/akka/actor/DynamicAccess.scala
index 504405764f..08de413717 100644
--- a/akka-actor/src/main/scala/akka/actor/DynamicAccess.scala
+++ b/akka-actor/src/main/scala/akka/actor/DynamicAccess.scala
@@ -3,7 +3,7 @@
  */
 package akka.actor
 
-import akka.util.NonFatal
+import scala.util.control.NonFatal
 import java.lang.reflect.InvocationTargetException
 import scala.reflect.ClassTag
 
diff --git a/akka-actor/src/main/scala/akka/actor/IO.scala b/akka-actor/src/main/scala/akka/actor/IO.scala
index 2feee3e0bc..ac9e09ec47 100644
--- a/akka-actor/src/main/scala/akka/actor/IO.scala
+++ b/akka-actor/src/main/scala/akka/actor/IO.scala
@@ -8,7 +8,8 @@ import language.postfixOps
 
 import scala.concurrent.{ ExecutionContext, Future }
 import scala.concurrent.util.Duration
-import akka.util.{ ByteString, NonFatal }
+import scala.util.control.NonFatal
+import akka.util.ByteString
 import java.net.{ SocketAddress, InetSocketAddress }
 import java.io.IOException
 import java.nio.ByteBuffer
diff --git a/akka-actor/src/main/scala/akka/actor/TypedActor.scala b/akka-actor/src/main/scala/akka/actor/TypedActor.scala
index 92ba3e4742..ddc77a9627 100644
--- a/akka-actor/src/main/scala/akka/actor/TypedActor.scala
+++ b/akka-actor/src/main/scala/akka/actor/TypedActor.scala
@@ -7,7 +7,8 @@ import language.existentials
 
 import akka.japi.{ Creator, Option ⇒ JOption }
 import java.lang.reflect.{ InvocationTargetException, Method, InvocationHandler, Proxy }
-import akka.util.{ Timeout, NonFatal }
+import akka.util.Timeout
+import scala.util.control.NonFatal
 import scala.concurrent.util.Duration
 import scala.concurrent.{ Await, Future }
 import akka.util.Reflect.instantiator
diff --git a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
index 92c4a36795..9a3aacba4b 100644
--- a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
@@ -7,15 +7,15 @@ package akka.dispatch
 import java.util.concurrent._
 import akka.event.Logging.{ Error, LogEventException }
 import akka.actor._
-import scala.annotation.tailrec
 import akka.event.EventStream
 import com.typesafe.config.Config
 import akka.serialization.SerializationExtension
+import akka.util.{ Unsafe, Index }
+import scala.annotation.tailrec
 import scala.concurrent.forkjoin.{ ForkJoinTask, ForkJoinPool }
-import akka.util.{ Unsafe, NonFatal, Index }
 import scala.concurrent.util.Duration
-import scala.concurrent.ExecutionContext
-import scala.concurrent.{ Await, Awaitable }
+import scala.concurrent.{ ExecutionContext, Await, Awaitable }
+import scala.util.control.NonFatal
 
 final case class Envelope private (val message: Any, val sender: ActorRef)
 
diff --git a/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala b/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala
index 1a6afc69ab..1affa34a07 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala
@@ -3,16 +3,16 @@
  */
 package akka.dispatch
 
-import akka.AkkaException
 import java.util.{ Comparator, PriorityQueue, Queue, Deque }
-import scala.concurrent.util.Duration
-import akka.actor.{ ActorCell, ActorRef, Cell }
-import akka.util.{ Unsafe, NonFatal, BoundedBlockingQueue }
 import java.util.concurrent._
-import annotation.tailrec
+import akka.AkkaException
+import akka.actor.{ ActorCell, ActorRef, Cell, ActorSystem, InternalActorRef, DeadLetter }
+import akka.util.{ Unsafe, BoundedBlockingQueue }
 import akka.event.Logging.Error
+import scala.concurrent.util.Duration
+import scala.annotation.tailrec
+import scala.util.control.NonFatal
 import com.typesafe.config.Config
-import akka.actor._
 
 /**
  * INTERNAL API
diff --git a/akka-actor/src/main/scala/akka/pattern/AskSupport.scala b/akka-actor/src/main/scala/akka/pattern/AskSupport.scala
index 2efd17aed9..944420f194 100644
--- a/akka-actor/src/main/scala/akka/pattern/AskSupport.scala
+++ b/akka-actor/src/main/scala/akka/pattern/AskSupport.scala
@@ -6,11 +6,12 @@ package akka.pattern
 import language.implicitConversions
 
 import java.util.concurrent.TimeoutException
-import annotation.tailrec
 import akka.actor._
 import akka.dispatch._
+import scala.annotation.tailrec
+import scala.util.control.NonFatal
 import scala.concurrent.{ Future, Promise, ExecutionContext }
-import akka.util.{ NonFatal, Timeout, Unsafe }
+import akka.util.{ Timeout, Unsafe }
 
 /**
  * This is what is used to complete a Future that is returned from an ask/? call,
diff --git a/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala b/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala
index f9a95db962..2bd4dfb71c 100644
--- a/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala
+++ b/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala
@@ -6,12 +6,13 @@ package akka.pattern
 import java.util.concurrent.atomic.{ AtomicInteger, AtomicLong, AtomicBoolean }
 import akka.AkkaException
 import akka.actor.Scheduler
-import akka.util.{ NonFatal, Unsafe }
+import akka.util.Unsafe
 import scala.util.control.NoStackTrace
 import java.util.concurrent.{ Callable, CopyOnWriteArrayList }
 import scala.concurrent.{ ExecutionContext, Future, Promise, Await }
 import scala.concurrent.util.{ Duration, Deadline }
 import scala.concurrent.util.duration._
+import scala.util.control.NonFatal
 
 /**
  * Companion object providing factory methods for Circuit Breaker which runs callbacks in caller's thread
diff --git a/akka-actor/src/main/scala/akka/pattern/FutureTimeoutSupport.scala b/akka-actor/src/main/scala/akka/pattern/FutureTimeoutSupport.scala
index 8155519774..72335d810b 100644
--- a/akka-actor/src/main/scala/akka/pattern/FutureTimeoutSupport.scala
+++ b/akka-actor/src/main/scala/akka/pattern/FutureTimeoutSupport.scala
@@ -7,7 +7,7 @@ package akka.pattern
 import scala.concurrent.util.Duration
 import scala.concurrent.{ ExecutionContext, Promise, Future }
 import akka.actor._
-import akka.util.NonFatal
+import scala.util.control.NonFatal
 
 trait FutureTimeoutSupport {
   /**
@@ -15,13 +15,11 @@ trait FutureTimeoutSupport {
    * after the specified duration.
    */
   def after[T](duration: Duration, using: Scheduler)(value: ⇒ Future[T])(implicit ec: ExecutionContext): Future[T] =
-    if (duration.isFinite() && duration.length < 1) value else {
+    if (duration.isFinite() && duration.length < 1) {
+      try value catch { case NonFatal(t) ⇒ Future.failed(t) }
+    } else {
       val p = Promise[T]()
-      val c = using.scheduleOnce(duration) {
-        p completeWith { try value catch { case NonFatal(t) ⇒ Future.failed(t) } }
-      }
-      val f = p.future
-      f onComplete { _ ⇒ c.cancel() }
-      f
+      using.scheduleOnce(duration) { p completeWith { try value catch { case NonFatal(t) ⇒ Future.failed(t) } } }
+      p.future
     }
 }
\ No newline at end of file
diff --git a/akka-actor/src/main/scala/akka/serialization/Serialization.scala b/akka-actor/src/main/scala/akka/serialization/Serialization.scala
index 9c1ed14492..ee5e87466b 100644
--- a/akka-actor/src/main/scala/akka/serialization/Serialization.scala
+++ b/akka-actor/src/main/scala/akka/serialization/Serialization.scala
@@ -10,7 +10,7 @@ import com.typesafe.config.Config
 import akka.actor.{ Extension, ExtendedActorSystem, Address, DynamicAccess }
 import akka.event.Logging
 import java.util.concurrent.ConcurrentHashMap
-import akka.util.NonFatal
+import scala.util.control.NonFatal
 import scala.collection.mutable.ArrayBuffer
 import java.io.NotSerializableException
 
diff --git a/akka-actor/src/main/scala/akka/util/NonFatal.scala b/akka-actor/src/main/scala/akka/util/NonFatal.scala
deleted file mode 100644
index e14a491910..0000000000
--- a/akka-actor/src/main/scala/akka/util/NonFatal.scala
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
- */
-package akka.util
-
-/**
- * Extractor of non-fatal Throwables. Will not match fatal errors
- * like VirtualMachineError (OutOfMemoryError)
- * ThreadDeath, LinkageError and InterruptedException.
- * StackOverflowError is matched, i.e. considered non-fatal.
- *
- * Usage to catch all harmless throwables:
- * {{{
- *   try {
- *     // dangerous stuff
- *   } catch {
- *     case NonFatal(e) => log.error(e, "Something not that bad")
- *   }
- * }}}
- */
-object NonFatal {
-  def unapply(t: Throwable): Option[Throwable] = t match {
-    case e: StackOverflowError ⇒ Some(e) // StackOverflowError ok even though it is a VirtualMachineError
-    // VirtualMachineError includes OutOfMemoryError and other fatal errors
-    case _: VirtualMachineError | _: ThreadDeath | _: InterruptedException | _: LinkageError ⇒ None
-    case e ⇒ Some(e)
-  }
-}
-
diff --git a/akka-actor/src/main/scala/akka/util/Reflect.scala b/akka-actor/src/main/scala/akka/util/Reflect.scala
index d6599ca253..f62ea5fb8c 100644
--- a/akka-actor/src/main/scala/akka/util/Reflect.scala
+++ b/akka-actor/src/main/scala/akka/util/Reflect.scala
@@ -2,6 +2,7 @@
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 package akka.util
+import scala.util.control.NonFatal
 
 /**
  * Collection of internal reflection utilities which may or may not be
diff --git a/akka-camel/src/main/scala/akka/camel/internal/DefaultCamel.scala b/akka-camel/src/main/scala/akka/camel/internal/DefaultCamel.scala
index ed3cf74271..cae98ce33c 100644
--- a/akka-camel/src/main/scala/akka/camel/internal/DefaultCamel.scala
+++ b/akka-camel/src/main/scala/akka/camel/internal/DefaultCamel.scala
@@ -6,7 +6,7 @@ import org.apache.camel.impl.DefaultCamelContext
 import scala.Predef._
 import akka.event.Logging
 import akka.camel.Camel
-import akka.util.NonFatal
+import scala.util.control.NonFatal
 import scala.concurrent.util.Duration
 import org.apache.camel.{ ProducerTemplate, CamelContext }
 
diff --git a/akka-camel/src/main/scala/akka/camel/internal/ProducerRegistry.scala b/akka-camel/src/main/scala/akka/camel/internal/ProducerRegistry.scala
index d338dbfdea..8631039a11 100644
--- a/akka-camel/src/main/scala/akka/camel/internal/ProducerRegistry.scala
+++ b/akka-camel/src/main/scala/akka/camel/internal/ProducerRegistry.scala
@@ -5,7 +5,7 @@ import org.apache.camel.processor.SendProcessor
 import akka.actor.{ Props, ActorRef, Terminated, Actor }
 import org.apache.camel.Endpoint
 import akka.camel._
-import akka.util.NonFatal
+import scala.util.control.NonFatal
 
 /**
  * Watches the end of life of <code>Producer</code>s.
diff --git a/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala b/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala
index d92a422fb5..95d1f6cc2d 100644
--- a/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala
+++ b/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala
@@ -17,9 +17,10 @@ import akka.pattern._
 import scala.reflect.BeanProperty
 import scala.concurrent.util.duration._
 import scala.concurrent.util.Duration
+import scala.util.control.NonFatal
 import java.util.concurrent.{ TimeoutException, CountDownLatch }
 import akka.camel.internal.CamelExchangeAdapter
-import akka.util.{ NonFatal, Timeout }
+import akka.util.Timeout
 import akka.camel.{ ActorNotRegisteredException, ConsumerConfig, Camel, Ack, FailureResult, CamelMessage }
 
 /**
diff --git a/akka-docs/scala/code/docs/testkit/TestkitDocSpec.scala b/akka-docs/scala/code/docs/testkit/TestkitDocSpec.scala
index 6c55804c17..94ddceab2f 100644
--- a/akka-docs/scala/code/docs/testkit/TestkitDocSpec.scala
+++ b/akka-docs/scala/code/docs/testkit/TestkitDocSpec.scala
@@ -16,7 +16,7 @@ import scala.concurrent.Future
 import akka.testkit.AkkaSpec
 import akka.testkit.DefaultTimeout
 import akka.testkit.ImplicitSender
-import akka.util.NonFatal
+import scala.util.control.NonFatal
 
 object TestkitDocSpec {
   case object Say42
diff --git a/akka-durable-mailboxes/akka-file-mailbox/src/main/scala/akka/actor/mailbox/FileBasedMailbox.scala b/akka-durable-mailboxes/akka-file-mailbox/src/main/scala/akka/actor/mailbox/FileBasedMailbox.scala
index 18436a165a..2341f47fd5 100644
--- a/akka-durable-mailboxes/akka-file-mailbox/src/main/scala/akka/actor/mailbox/FileBasedMailbox.scala
+++ b/akka-durable-mailboxes/akka-file-mailbox/src/main/scala/akka/actor/mailbox/FileBasedMailbox.scala
@@ -9,7 +9,7 @@ import akka.event.Logging
 import com.typesafe.config.Config
 import akka.ConfigurationException
 import akka.dispatch._
-import akka.util.NonFatal
+import scala.util.control.NonFatal
 import akka.pattern.{ CircuitBreakerOpenException, CircuitBreaker }
 import scala.concurrent.util.Duration
 
diff --git a/akka-durable-mailboxes/akka-file-mailbox/src/main/scala/akka/actor/mailbox/filequeue/Journal.scala b/akka-durable-mailboxes/akka-file-mailbox/src/main/scala/akka/actor/mailbox/filequeue/Journal.scala
index 65910fb158..5d5ed54ae7 100644
--- a/akka-durable-mailboxes/akka-file-mailbox/src/main/scala/akka/actor/mailbox/filequeue/Journal.scala
+++ b/akka-durable-mailboxes/akka-file-mailbox/src/main/scala/akka/actor/mailbox/filequeue/Journal.scala
@@ -21,7 +21,7 @@ import java.io._
 import java.nio.{ ByteBuffer, ByteOrder }
 import java.nio.channels.FileChannel
 import akka.event.LoggingAdapter
-import akka.util.NonFatal
+import scala.util.control.NonFatal
 
 // returned from journal replay
 sealed trait JournalItem
diff --git a/akka-remote-tests/src/test/scala/akka/remote/testkit/MultiNodeSpec.scala b/akka-remote-tests/src/test/scala/akka/remote/testkit/MultiNodeSpec.scala
index 511fd117c4..29f404e1f9 100644
--- a/akka-remote-tests/src/test/scala/akka/remote/testkit/MultiNodeSpec.scala
+++ b/akka-remote-tests/src/test/scala/akka/remote/testkit/MultiNodeSpec.scala
@@ -8,13 +8,14 @@ import language.implicitConversions
 import java.net.InetSocketAddress
 import com.typesafe.config.{ ConfigObject, ConfigFactory, Config }
 import akka.actor.{ RootActorPath, ActorPath, ActorSystem, ExtendedActorSystem }
-import scala.concurrent.{ Await, Awaitable }
-import akka.util.{ Timeout, NonFatal }
+import akka.util.Timeout
 import akka.remote.testconductor.{ TestConductorExt, TestConductor, RoleName }
+import akka.remote.RemoteActorRefProvider
 import akka.testkit.AkkaSpec
+import scala.concurrent.{ Await, Awaitable }
+import scala.util.control.NonFatal
 import scala.concurrent.util.Duration
 import scala.concurrent.util.duration._
-import akka.remote.RemoteActorRefProvider
 
 /**
  * Configure the role names and participants of the test, including configuration settings.
diff --git a/akka-remote/src/main/scala/akka/remote/netty/Client.scala b/akka-remote/src/main/scala/akka/remote/netty/Client.scala
index 35c0674d23..0b66cd3b7c 100644
--- a/akka-remote/src/main/scala/akka/remote/netty/Client.scala
+++ b/akka-remote/src/main/scala/akka/remote/netty/Client.scala
@@ -17,7 +17,8 @@ import akka.remote.{ RemoteProtocol, RemoteMessage, RemoteLifeCycleEvent, Remote
 import akka.AkkaException
 import akka.event.Logging
 import akka.actor.{ DeadLetter, Address, ActorRef }
-import akka.util.{ NonFatal, Switch }
+import akka.util.Switch
+import scala.util.control.NonFatal
 import org.jboss.netty.handler.ssl.SslHandler
 
 /**
diff --git a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
index b87f873cde..6e36c63024 100644
--- a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
@@ -20,7 +20,7 @@ import org.jboss.netty.util.{ DefaultObjectSizeEstimator, HashedWheelTimer }
 import akka.event.Logging
 import akka.remote.RemoteProtocol.AkkaRemoteProtocol
 import akka.remote.{ RemoteTransportException, RemoteTransport, RemoteActorRefProvider, RemoteActorRef, RemoteServerStarted }
-import akka.util.NonFatal
+import scala.util.control.NonFatal
 import akka.actor.{ ExtendedActorSystem, Address, ActorRef }
 import com.google.protobuf.MessageLite
 
diff --git a/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala b/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala
index 2c327575c0..c0143498e3 100644
--- a/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala
+++ b/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala
@@ -11,13 +11,13 @@ import java.util.LinkedList
 import scala.annotation.tailrec
 import com.typesafe.config.Config
 import akka.actor.{ ActorInitializationException, ExtensionIdProvider, ExtensionId, Extension, ExtendedActorSystem, ActorRef, ActorCell }
-import akka.dispatch.{ MailboxType, TaskInvocation, SystemMessage, Suspend, Resume, MessageDispatcherConfigurator, MessageDispatcher, Mailbox, Envelope, DispatcherPrerequisites, DefaultSystemMessageQueue }
+import akka.dispatch.{ MessageQueue, MailboxType, TaskInvocation, SystemMessage, Suspend, Resume, MessageDispatcherConfigurator, MessageDispatcher, Mailbox, Envelope, DispatcherPrerequisites, DefaultSystemMessageQueue }
 import scala.concurrent.util.duration.intToDurationInt
-import akka.util.{ Switch, NonFatal }
+import akka.util.Switch
 import scala.concurrent.util.Duration
 import scala.concurrent.Awaitable
 import akka.actor.ActorContext
-import akka.dispatch.MessageQueue
+import scala.util.control.NonFatal
 
 /*
  * Locking rules:
diff --git a/akka-transactor/src/test/scala/akka/transactor/FickleFriendsSpec.scala b/akka-transactor/src/test/scala/akka/transactor/FickleFriendsSpec.scala
index eb9a30f4c7..4e1219324e 100644
--- a/akka-transactor/src/test/scala/akka/transactor/FickleFriendsSpec.scala
+++ b/akka-transactor/src/test/scala/akka/transactor/FickleFriendsSpec.scala
@@ -17,7 +17,8 @@ import scala.concurrent.stm._
 import scala.util.Random.{ nextInt ⇒ random }
 import java.util.concurrent.CountDownLatch
 import akka.pattern.{ AskTimeoutException, ask }
-import akka.util.{ NonFatal, Timeout }
+import akka.util.Timeout
+import scala.util.control.NonFatal
 
 object FickleFriends {
   case class FriendlyIncrement(friends: Seq[ActorRef], timeout: Timeout, latch: CountDownLatch)
diff --git a/akka-zeromq/src/main/scala/akka/zeromq/ConcurrentSocketActor.scala b/akka-zeromq/src/main/scala/akka/zeromq/ConcurrentSocketActor.scala
index bc2337f414..945f0b6df3 100644
--- a/akka-zeromq/src/main/scala/akka/zeromq/ConcurrentSocketActor.scala
+++ b/akka-zeromq/src/main/scala/akka/zeromq/ConcurrentSocketActor.scala
@@ -12,7 +12,7 @@ import scala.annotation.tailrec
 import scala.collection.mutable.ListBuffer
 import akka.event.Logging
 import java.util.concurrent.TimeUnit
-import akka.util.NonFatal
+import scala.util.control.NonFatal
 
 private[zeromq] object ConcurrentSocketActor {
   private sealed trait PollMsg