Author: fhanik
Date: Thu May 15 08:56:55 2008
New Revision: 656714
URL: http://svn.apache.org/viewvc?rev=656714&view=rev
Log:
fix bug
Fixes: https://issues.apache.org/bugzilla/show_bug.cgi?id=44833
correctly override methods from StandardSession
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=656714&r1=656713&r2=656714&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 15 08:56:55 2008
@@ -61,12 +61,6 @@
+1: jfclere, rjung, fhanik, remm, pero
-1:
-* Correctly override methods
- Fixes: https://issues.apache.org/bugzilla/show_bug.cgi?id=44833
- http://svn.apache.org/viewvc?view=rev&revision=649238
- +1: fhanik, markt, pero
- -1:
-
* Expose always send flag for configuration
http://svn.apache.org/viewvc?view=rev&revision=649252
+1: fhanik, markt, pero
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=656714&r1=656713&r2=656714&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Thu May 15 08:56:55 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));
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=656714&r1=656713&r2=656714&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu May 15 08:56:55 2008
@@ -35,6 +35,9 @@
<section name="Tomcat 6.0.17 (remm)">
<subsection name="Catalina">
<changelog>
+ <fix><bug>44833</bug>
+ correctly override StandardSession methods from DeltaSession
+ </fix>
<fix><bug>42662</bug>
properly resolve reflection proxies during session replication
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
