Author: pero
Date: Mon Jan 21 01:19:02 2008
New Revision: 613805
URL: http://svn.apache.org/viewvc?rev=613805&view=rev
Log:
Fix wrong && at ReplicationValve
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.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=613805&r1=613804&r2=613805&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 21 01:19:02 2008
@@ -54,11 +54,6 @@
http://svn.apache.org/viewvc?rev=613266&view=rev
+1: markt
-1:
-
-* Fix wrong &&
-
http://people.apache.org/~pero/patches/tc55/2007-11-16-1-ReplicationValve-tc55.patch
- +1: pero, markt, rjung
- -1:
* Fix FarmWarDeployer can be only config at Host Element (small changes s.
tomcat 55 STATUS.txt)
http://people.apache.org/~pero/patches/tc55/2007-11-16-1-FarmWarDeployer-tc55.patch
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java?rev=613805&r1=613804&r2=613805&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
Mon Jan 21 01:19:02 2008
@@ -467,7 +467,7 @@
*/
protected void resetReplicationRequest(Request request, boolean
isCrossContext) {
Session contextSession = request.getSessionInternal(false);
- if(contextSession != null & contextSession instanceof DeltaSession){
+ if(contextSession != null && contextSession instanceof DeltaSession){
resetDeltaRequest(contextSession);
((DeltaSession)contextSession).setPrimarySession(true);
}
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=613805&r1=613804&r2=613805&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jan 21 01:19:02 2008
@@ -261,6 +261,9 @@
</subsection>
<subsection name="Cluster">
<changelog>
+ <fix>
+ Fix wrong && at ReplicationValve (pero)
+ </fix>
<update>
Add get/set methods for properties in the Tcp Failure detector.
(fhanik/jim)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
