From 5f059d18b51005cd3344e61e47a8f911aaab5fad Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Tue, 19 Sep 2017 13:04:09 +0200
Subject: [PATCH] Add AbstractPersistentActorWithTimers, #23652 (#23653)

---
 .../src/main/scala/akka/persistence/PersistentActor.scala     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/akka-persistence/src/main/scala/akka/persistence/PersistentActor.scala b/akka-persistence/src/main/scala/akka/persistence/PersistentActor.scala
index 1059e91cc8..d7a0d81a2d 100644
--- a/akka-persistence/src/main/scala/akka/persistence/PersistentActor.scala
+++ b/akka-persistence/src/main/scala/akka/persistence/PersistentActor.scala
@@ -530,3 +530,7 @@ abstract class AbstractPersistentActor extends AbstractActor with Eventsourced {
 
 }
 
+/**
+ * Java API: Combination of [[AbstractPersistentActor]] and [[akka.actor.AbstractActorWithTimers]].
+ */
+abstract class AbstractPersistentActorWithTimers extends AbstractPersistentActor with Timers