svn commit: r1519716 - in /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer: CalendarTimerData.java TimerData.java

[rmannibucau]

Author: rmannibucau
Date: Tue Sep  3 15:14:09 2013
New Revision: 1519716

URL: http://svn.apache.org/r1519716
Log:
making CalendarTimerData serializable

Modified:
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/CalendarTimerData.java
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerData.java

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/CalendarTimerData.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/CalendarTimerData.java?rev=1519716&r1=1519715&r2=1519716&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/CalendarTimerData.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/CalendarTimerData.java
 Tue Sep  3 15:14:09 2013
@@ -65,16 +65,14 @@ public class CalendarTimerData extends T
         }
     }
 
-    @Override
-    protected void writeObject(final ObjectOutputStream out) throws 
IOException {
-        super.writeObject(out);
+    private void writeObject(final ObjectOutputStream out) throws IOException {
+        super.doWriteObject(out);
         out.writeBoolean(autoCreated);
         out.writeObject(scheduleExpression);
     }
 
-    @Override
-    protected void readObject(final ObjectInputStream in) throws IOException {
-        super.readObject(in);
+    private void readObject(final ObjectInputStream in) throws IOException {
+        super.doReadObject(in);
         autoCreated = in.readBoolean();
         try {
             scheduleExpression = 
ScheduleExpression.class.cast(in.readObject());

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerData.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerData.java?rev=1519716&r1=1519715&r2=1519716&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerData.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerData.java
 Tue Sep  3 15:14:09 2013
@@ -112,7 +112,11 @@ public abstract class TimerData implemen
         this.timeoutMethod = timeoutMethod;
     }
 
-    protected void writeObject(final ObjectOutputStream out) throws 
IOException {
+    private void writeObject(final ObjectOutputStream out) throws IOException {
+        doWriteObject(out);
+    }
+
+    protected void doWriteObject(final ObjectOutputStream out) throws 
IOException {
         out.writeLong(id);
         out.writeUTF(deploymentId);
         out.writeBoolean(persistent);
@@ -124,7 +128,11 @@ public abstract class TimerData implemen
         out.writeUTF(timeoutMethod.getName());
     }
 
-    protected void readObject(final ObjectInputStream in) throws IOException {
+    private void readObject(final ObjectInputStream in) throws IOException {
+        doReadObject(in);
+    }
+
+    protected void doReadObject(final ObjectInputStream in) throws IOException 
{
         id = in.readLong();
         deploymentId = in.readUTF();
         persistent = in.readBoolean();
@@ -154,7 +162,6 @@ public abstract class TimerData implemen
                 timeoutMethod = method;
                 break;
             }
-
         }
     }