TAP5-2635: Deadlock when using eager-loaded services
through PeriodicExecutor
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/PeriodicExecutorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/PeriodicExecutorImpl.java
index f18c726..96f639c 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/PeriodicExecutorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/cron/PeriodicExecutorImpl.java
@@ -23,9 +23,9 @@
import org.slf4j.Logger;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
@@ -46,6 +46,8 @@
private static final long FIVE_MINUTES = 5 * 60 * 1000;
private final AtomicInteger jobIdAllocator = new AtomicInteger();
+
+ private final AtomicBoolean started = new AtomicBoolean();
private final Lock jobLock = new ReentrantLock();
@@ -251,9 +253,16 @@
}
});
- thread.start();
}
+ public void init()
+ {
+ if (!started.get())
+ {
+ started.set(true);
+ thread.start();
+ }
+ }
void removeJob(Job job)
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/modules/TapestryIOCModule.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/modules/TapestryIOCModule.java
index 19f3528..13f9ded 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/modules/TapestryIOCModule.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/modules/TapestryIOCModule.java
@@ -273,4 +273,12 @@
configuration.add(IOCSymbols.THREAD_POOL_ENABLED, true);
configuration.add(IOCSymbols.THREAD_POOL_QUEUE_SIZE, 100);
}
+
+ public static void contributeRegistryStartup(OrderedConfiguration<Runnable> configuration,
+ PeriodicExecutor periodicExecutor)
+ {
+ configuration.add(PeriodicExecutor.class.getSimpleName(),
+ () -> periodicExecutor.init());
+ }
+
}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/PeriodicExecutor.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/PeriodicExecutor.java
index 0caae54..72f47cc 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/PeriodicExecutor.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/cron/PeriodicExecutor.java
@@ -30,4 +30,10 @@
* @return a PeriodicJob that can be used to query when the job executes, or to cancel its execution
*/
PeriodicJob addJob(Schedule schedule, String name, Runnable job);
+
+ /**
+ * Initializes this service. <em>Never call this method direclty. It's intended
+ * for internal Tapestry-IoC usage only</em>.
+ */
+ public void init();
}
