Author: fhanik
Date: Thu Sep 3 19:44:42 2009
New Revision: 811091
URL: http://svn.apache.org/viewvc?rev=811091&view=rev
Log:
Reset data diff
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.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=811091&r1=811090&r2=811091&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Sep 3 19:44:42 2009
@@ -80,11 +80,6 @@
-0: kkolinko: http://marc.info/?l=tomcat-dev&m=124192105131636&w=2
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47369.
- http://svn.apache.org/viewvc?rev=784879&view=rev
- +1: fhanik, markt, mturk, rjung
- -1:
-
* When throwing Non-serializable exception, mark which argument was
non-serializable to help tracing the cause when developing.
http://svn.apache.org/viewvc?rev=713953&view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=811091&r1=811090&r2=811091&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Thu Sep 3 19:44:42 2009
@@ -401,6 +401,7 @@
rentry.getDiff(),
entry.getPrimary(),
entry.getBackupNodes());
+ rentry.resetDiff();
} catch (IOException x) {
log.error("Unable to diff object. Will replicate the
entire object instead.", x);
} finally {
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=811091&r1=811090&r2=811091&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Sep 3 19:44:42 2009
@@ -207,6 +207,9 @@
<subsection name="Cluster">
<changelog>
<fix>
+ <bug>47369</bug>: Reset data diff after replication
+ </fix>
+ <fix>
<bug>40551</bug>: Enable the JvmRouteBinderValve to work with
PersistentManagers as well as clustering. Based on a patch by Chris
Chandler. (markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
