Author: andygumbrecht Date: Wed Jul 23 09:16:59 2014 New Revision: 1612806 URL: http://svn.apache.org/r1612806 Log: Merged revision(s) 1612637 from tomee/tomee/trunk: TOMEE-1275 resetting TimerExecutor when it is shut down
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/core/timer/DefaultTimerThreadPoolAdapter.java Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/core/timer/DefaultTimerThreadPoolAdapter.java URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/core/timer/DefaultTimerThreadPoolAdapter.java?rev=1612806&r1=1612805&r2=1612806&view=diff ============================================================================== --- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/core/timer/DefaultTimerThreadPoolAdapter.java (original) +++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/core/timer/DefaultTimerThreadPoolAdapter.java Wed Jul 23 09:16:59 2014 @@ -169,6 +169,7 @@ public class DefaultTimerThreadPoolAdapt logger.error(e.getMessage(), e); } } + SystemInstance.get().removeComponent(TimerExecutor.class); } }