Author: fhanik
Date: Thu Apr 17 12:20:00 2008
New Revision: 649238
URL: http://svn.apache.org/viewvc?rev=649238&view=rev
Log:
fix override of methods from standardsession
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=649238&r1=649237&r2=649238&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Thu Apr
17 12:20:00 2008
@@ -22,6 +22,8 @@
import java.io.NotSerializableException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.security.Principal;
import java.util.ArrayList;
@@ -446,6 +448,10 @@
* @exception IOException
* if an input/output error occurs
*/
+ @Override
+ public void readObjectData(ObjectInputStream stream) throws
ClassNotFoundException, IOException {
+ readObject((ObjectInput)stream);
+ }
public void readObjectData(ObjectInput stream) throws
ClassNotFoundException, IOException {
readObject(stream);
}
@@ -461,6 +467,10 @@
* @exception IOException
* if an input/output error occurs
*/
+ @Override
+ public void writeObjectData(ObjectOutputStream stream) throws IOException {
+ writeObjectData((ObjectOutput)stream);
+ }
public void writeObjectData(ObjectOutput stream) throws IOException {
writeObject(stream);
}
@@ -578,6 +588,11 @@
* @exception IOException
* if an input/output error occurs
*/
+ @Override
+ protected void readObject(ObjectInputStream stream) throws
ClassNotFoundException, IOException {
+ readObject((ObjectInput)stream);
+ }
+
private void readObject(ObjectInput stream) throws ClassNotFoundException,
IOException {
// Deserialize the scalar instance variables (except Manager)
@@ -654,6 +669,10 @@
* @exception IOException
* if an input/output error occurs
*/
+ protected void writeObject(ObjectOutputStream stream) throws IOException {
+ writeObject((ObjectOutput)stream);
+ }
+
private void writeObject(ObjectOutput stream) throws IOException {
// Write the scalar instance variables (except Manager)
stream.writeObject(new Long(creationTime));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
