You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/04/10 00:49:47 UTC
[1/2] tomee git commit: getAllTimers allowed from session context +
calendar timers + autocreated ones shouldnt be ignored
Repository: tomee
Updated Branches:
refs/heads/master 9fcc6bb9a -> ce7d7480f
getAllTimers allowed from session context + calendar timers + autocreated ones shouldnt be ignored
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/32cdf86b
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/32cdf86b
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/32cdf86b
Branch: refs/heads/master
Commit: 32cdf86bd57362a30e30ac45d49ff0ac4caac861
Parents: 9fcc6bb
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Fri Apr 10 00:49:23 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Fri Apr 10 00:49:23 2015 +0200
----------------------------------------------------------------------
.../org/apache/openejb/core/BaseContext.java | 15 +++-
.../openejb/core/timer/EjbTimerServiceImpl.java | 4 +-
.../openejb/core/timer/TimerServiceWrapper.java | 94 ++------------------
3 files changed, 18 insertions(+), 95 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/32cdf86b/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java b/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java
index 58cd744..249d61d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/BaseContext.java
@@ -22,6 +22,7 @@ import org.apache.openejb.OpenEJBException;
import org.apache.openejb.core.ivm.IntraVmArtifact;
import org.apache.openejb.core.timer.EjbTimerService;
import org.apache.openejb.core.timer.TimerServiceImpl;
+import org.apache.openejb.core.timer.Timers;
import org.apache.openejb.core.transaction.EjbUserTransaction;
import org.apache.openejb.core.transaction.TransactionPolicy;
import org.apache.openejb.core.transaction.TransactionType;
@@ -29,8 +30,10 @@ import org.apache.openejb.spi.SecurityService;
import org.apache.openejb.threads.task.CUTask;
import javax.ejb.EJBContext;
+import javax.ejb.EJBException;
import javax.ejb.EJBHome;
import javax.ejb.EJBLocalHome;
+import javax.ejb.Timer;
import javax.ejb.TimerService;
import javax.interceptor.InvocationContext;
import javax.naming.Context;
@@ -45,6 +48,7 @@ import java.io.ObjectStreamException;
import java.io.Serializable;
import java.security.Identity;
import java.security.Principal;
+import java.util.Collection;
import java.util.Map;
import java.util.Properties;
@@ -208,16 +212,19 @@ public abstract class BaseContext implements EJBContext, Serializable {
final EjbTimerService timerService = beanContext.getEjbTimerService();
if (timerService == null) {
throw new IllegalStateException("This ejb does not support timers " + beanContext.getDeploymentID());
- }
-
- if (!timerService.isStarted()) {
+ } else if (!timerService.isStarted()) {
try {
timerService.start();
} catch (final OpenEJBException e) {
throw new IllegalStateException(e);
}
}
- return new TimerServiceImpl(timerService, threadContext.getPrimaryKey(), beanContext.getEjbTimeout());
+ return new TimerServiceImpl(timerService, threadContext.getPrimaryKey(), beanContext.getEjbTimeout()) {
+ @Override
+ public Collection<Timer> getAllTimers() throws IllegalStateException, EJBException {
+ return Timers.all(); // allowed here
+ }
+ };
}
public boolean isTimerMethodAllowed() {
http://git-wip-us.apache.org/repos/asf/tomee/blob/32cdf86b/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java
index 08981c9..b22d20d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java
@@ -586,9 +586,9 @@ public class EjbTimerServiceImpl implements EjbTimerService, Serializable {
final Collection<Timer> timers = new ArrayList<Timer>();
for (final TimerData timerData : timerStore.getTimers((String) deployment.getDeploymentID())) {
- if (!CalendarTimerData.class.isInstance(timerData) || !CalendarTimerData.class.cast(timerData).isAutoCreated()) {
+ // if (!CalendarTimerData.class.isInstance(timerData) || !CalendarTimerData.class.cast(timerData).isAutoCreated()) {
timers.add(timerData.getTimer());
- }
+ // }
}
return timers;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/32cdf86b/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerServiceWrapper.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerServiceWrapper.java b/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerServiceWrapper.java
index d58cf9c..0dca08f 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerServiceWrapper.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerServiceWrapper.java
@@ -18,30 +18,18 @@
package org.apache.openejb.core.timer;
import org.apache.openejb.BeanContext;
-import org.apache.openejb.BeanType;
-import org.apache.openejb.MethodContext;
-import org.apache.openejb.ModuleContext;
import org.apache.openejb.core.ThreadContext;
-import org.apache.openejb.util.LogCategory;
-import org.apache.openejb.util.Logger;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Date;
import javax.ejb.EJBException;
import javax.ejb.ScheduleExpression;
import javax.ejb.Timer;
import javax.ejb.TimerConfig;
import javax.ejb.TimerService;
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
public class TimerServiceWrapper implements TimerService {
-
- private static final Logger log = Logger.getInstance(LogCategory.TIMER, TimerServiceWrapper.class);
-
public Timer createTimer(final Date initialExpiration, final long intervalDuration, final Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException {
return getTimerService().createTimer(initialExpiration, intervalDuration, info);
}
@@ -64,32 +52,7 @@ public class TimerServiceWrapper implements TimerService {
@Override
public Collection<Timer> getAllTimers() throws IllegalStateException, EJBException {
- final ThreadContext threadContext = ThreadContext.getThreadContext();
- final BeanContext beanContext = threadContext.getBeanContext();
- final ModuleContext module = beanContext.getModuleContext();
-
- final Collection<Timer> timers = new HashSet<>();
- for (final BeanContext c : module.getAppContext().getBeanContexts()) {
- if (c.getModuleContext() == module) { // filter by module
- if (c.getComponentType() != BeanType.STATEFUL) {
- final TimerService timerService = getTimerService(null, c, true);
- if (timerService == null) {
- continue;
- }
- final Collection<Timer> beanTimers = timerService.getTimers();
- timers.addAll(beanTimers);
- } else {
- // for all instances
- final TimerService timerService = getTimerService(null, c, true);
- if (timerService == null) {
- continue;
- }
- final Collection<Timer> beanTimers = timerService.getTimers();
- timers.addAll(beanTimers);
- }
- }
- }
- return timers;
+ return Timers.all();
}
public Timer createSingleActionTimer(final long l, final TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException {
@@ -119,53 +82,6 @@ public class TimerServiceWrapper implements TimerService {
private TimerService getTimerService() throws IllegalStateException {
final ThreadContext threadContext = ThreadContext.getThreadContext();
final BeanContext beanContext = threadContext.getBeanContext();
- return getTimerService(threadContext.getPrimaryKey(), beanContext, false);
- }
-
- private TimerService getTimerService(final Object pk, final BeanContext beanContext, final boolean nullIfNotRelevant) throws IllegalStateException {
- final EjbTimerService timerService = beanContext.getEjbTimerService();
- if (timerService == null) {
- throw new IllegalStateException("This ejb does not support timers " + beanContext.getDeploymentID());
- } else if (beanContext.getEjbTimeout() == null) {
-
- HasSchedule hasSchedule = beanContext.get(HasSchedule.class);
-
- boolean hasSchedules = false;
-
- if (hasSchedule != null) {
- hasSchedules = hasSchedule.value;
- } else {
- for (final Iterator<Map.Entry<Method, MethodContext>> it = beanContext.iteratorMethodContext(); it.hasNext(); ) {
- final Map.Entry<Method, MethodContext> entry = it.next();
- final MethodContext methodContext = entry.getValue();
- if (methodContext.getSchedules().size() > 0) {
- hasSchedules = true;
- }
- }
- synchronized (beanContext) { // surely not the best lock instance but works in this context
- if (beanContext.get(HasSchedule.class) == null) {
- beanContext.set(HasSchedule.class, new HasSchedule(hasSchedules));
- }
- }
- }
-
- if (!hasSchedules) {
- if (nullIfNotRelevant) {
- return null;
- }
- log.error("This ejb does not support timers " + beanContext.getDeploymentID() + " due to no timeout method nor schedules in methodContext is configured");
- }
-
- }
-
- return new TimerServiceImpl(timerService, pk, beanContext.getEjbTimeout());
- }
-
- private static final class HasSchedule {
- private final boolean value;
-
- private HasSchedule(final boolean value) {
- this.value = value;
- }
+ return Timers.getTimerService(threadContext.getPrimaryKey(), beanContext, false);
}
}
[2/2] tomee git commit: new file
Posted by rm...@apache.org.
new file
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ce7d7480
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ce7d7480
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ce7d7480
Branch: refs/heads/master
Commit: ce7d7480f841d7cc262d3776d31d1f331083e139
Parents: 32cdf86
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Fri Apr 10 00:49:36 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Fri Apr 10 00:49:36 2015 +0200
----------------------------------------------------------------------
.../org/apache/openejb/core/timer/Timers.java | 116 +++++++++++++++++++
1 file changed, 116 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/ce7d7480/container/openejb-core/src/main/java/org/apache/openejb/core/timer/Timers.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/timer/Timers.java b/container/openejb-core/src/main/java/org/apache/openejb/core/timer/Timers.java
new file mode 100644
index 0000000..273d109
--- /dev/null
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/timer/Timers.java
@@ -0,0 +1,116 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.core.timer;
+
+import org.apache.openejb.BeanContext;
+import org.apache.openejb.BeanType;
+import org.apache.openejb.MethodContext;
+import org.apache.openejb.ModuleContext;
+import org.apache.openejb.core.ThreadContext;
+import org.apache.openejb.util.LogCategory;
+import org.apache.openejb.util.Logger;
+
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import javax.ejb.Timer;
+import javax.ejb.TimerService;
+
+public final class Timers {
+ private static final Logger LOGGER = Logger.getInstance(LogCategory.TIMER, TimerServiceWrapper.class);
+
+ private Timers() {
+ // no-op
+ }
+
+ public static Collection<Timer> all() {
+ final ThreadContext threadContext = ThreadContext.getThreadContext();
+ final BeanContext beanContext = threadContext.getBeanContext();
+ final ModuleContext module = beanContext.getModuleContext();
+
+ final Collection<Timer> timers = new HashSet<>();
+ for (final BeanContext c : module.getAppContext().getBeanContexts()) {
+ if (c.getModuleContext() == module) { // filter by module
+ if (c.getComponentType() != BeanType.STATEFUL) {
+ final TimerService timerService = getTimerService(null, c, true);
+ if (timerService == null) {
+ continue;
+ }
+ final Collection<Timer> beanTimers = timerService.getTimers();
+ timers.addAll(beanTimers);
+ } else {
+ // for all instances
+ final TimerService timerService = getTimerService(null, c, true);
+ if (timerService == null) {
+ continue;
+ }
+ final Collection<Timer> beanTimers = timerService.getTimers();
+ timers.addAll(beanTimers);
+ }
+ }
+ }
+ return timers;
+ }
+
+ public static TimerService getTimerService(final Object pk, final BeanContext beanContext, final boolean nullIfNotRelevant) throws IllegalStateException {
+ final EjbTimerService timerService = beanContext.getEjbTimerService();
+ if (timerService == null) {
+ throw new IllegalStateException("This ejb does not support timers " + beanContext.getDeploymentID());
+ } else if (beanContext.getEjbTimeout() == null) {
+
+ HasSchedule hasSchedule = beanContext.get(HasSchedule.class);
+
+ boolean hasSchedules = false;
+
+ if (hasSchedule != null) {
+ hasSchedules = hasSchedule.value;
+ } else {
+ for (final Iterator<Map.Entry<Method, MethodContext>> it = beanContext.iteratorMethodContext(); it.hasNext(); ) {
+ final Map.Entry<Method, MethodContext> entry = it.next();
+ final MethodContext methodContext = entry.getValue();
+ if (methodContext.getSchedules().size() > 0) {
+ hasSchedules = true;
+ }
+ }
+ synchronized (beanContext) { // surely not the best lock instance but works in this context
+ if (beanContext.get(HasSchedule.class) == null) {
+ beanContext.set(HasSchedule.class, new HasSchedule(hasSchedules));
+ }
+ }
+ }
+
+ if (!hasSchedules) {
+ if (nullIfNotRelevant) {
+ return null;
+ }
+ LOGGER.error("This ejb does not support timers " + beanContext.getDeploymentID() + " due to no timeout method nor schedules in methodContext is configured");
+ }
+
+ }
+ return new TimerServiceImpl(timerService, pk, beanContext.getEjbTimeout());
+ }
+
+ private static final class HasSchedule {
+ private final boolean value;
+
+ private HasSchedule(final boolean value) {
+ this.value = value;
+ }
+ }
+}