You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by xu...@apache.org on 2011/05/10 14:48:21 UTC
svn commit: r1101442 - in
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb:
config/AnnotationDeployer.java core/timer/TimerImpl.java
Author: xuhaihong
Date: Tue May 10 12:48:21 2011
New Revision: 1101442
URL: http://svn.apache.org/viewvc?rev=1101442&view=rev
Log:
OPENEJB-1543 If there's no info and timezone defined in @Schedule(xxxx), their values should be null instead of an empty string. (Patch from Shawn Jiang)
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerImpl.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1101442&r1=1101441&r2=1101442&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java Tue May 10 12:48:21 2011
@@ -2127,10 +2127,9 @@ public class AnnotationDeployer implemen
for (javax.ejb.Schedule schedule : scheduleAnnotationList) {
Timer timer = new Timer();
- timer.setInfo(schedule.info());
timer.setPersistent(schedule.persistent());
- timer.setInfo(schedule.info());
- timer.setTimezone(schedule.timezone());
+ timer.setInfo((schedule.info()==null||schedule.info().isEmpty())?null:schedule.info());
+ timer.setTimezone((schedule.timezone()==null||schedule.timezone().isEmpty())?null:schedule.timezone());
//Copy TimerSchedule
TimerSchedule timerSchedule = new TimerSchedule();
timerSchedule.setSecond(schedule.second());
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerImpl.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerImpl.java?rev=1101442&r1=1101441&r2=1101442&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerImpl.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerImpl.java Tue May 10 12:48:21 2011
@@ -56,7 +56,7 @@ public class TimerImpl implements Timer
public Serializable getInfo() throws IllegalStateException, NoSuchObjectLocalException {
checkState();
- return (Serializable) timerData.getInfo();
+ return timerData.getInfo()==null?null:(Serializable)timerData.getInfo();
}
public TimerHandle getHandle() throws IllegalStateException, NoSuchObjectLocalException {