Author: markt
Date: Wed Jan 14 16:15:56 2009
New Revision: 734575
URL: http://svn.apache.org/viewvc?rev=734575&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45261
Add a new SimpleCoordinator for tribes provided by Robert Newson
Added:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java
- copied, changed from r729815,
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-interceptor.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 14 16:15:56 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729809,730250,732859
+/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729809,729815,729934,730250,732859
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=734575&r1=734574&r2=734575&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 14 16:15:56 2009
@@ -145,13 +145,6 @@
+1: markt, fhanik
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45261
- Add a new SimpleCoordinator for tribes provided by Robert Newson
- http://svn.apache.org/viewvc?rev=729815&view=rev
- http://svn.apache.org/viewvc?rev=729934&view=rev
- +1: markt, fhanik, funkman
- -1:
-
* Print user friendly message when attempting to shutdown and shutdown port is
disabled
http://svn.apache.org/viewvc?rev=730178&view=rev
+1: fhanik, remm, funkman
Copied:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java
(from r729815,
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java?p2=tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java&p1=tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java&r1=729815&r2=734575&rev=734575&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java
Wed Jan 14 16:15:56 2009
@@ -86,7 +86,8 @@
}
final Member[] members = getMembers();
- final Member[] view = Arrays.copyOf(members, members.length + 1);
+ final Member[] view = new Member[members.length+1];
+ System.arraycopy(members, 0, view, 0, members.length);
view[members.length] = getLocalMember(false);
Arrays.sort(view, AbsoluteOrder.comp);
if (Arrays.equals(view, this.view)) {
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=734575&r1=734574&r2=734575&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 14 16:15:56 2009
@@ -375,6 +375,10 @@
<add>
Document the multicast recovery options. (fhanik)
</add>
+ <add>
+ <bug>45261</bug>: Add a new SimpleCoordinator for tribes provided by
+ Robert Newson. (markt)
+ </add>
<fix>
<bug>45618</bug>: Make sure NIO selector is closed when no longer used.
Unlikely to be an issue in normal usage. (markt)
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-interceptor.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-interceptor.xml?rev=734575&r1=734574&r2=734575&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-interceptor.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-interceptor.xml Wed Jan 14
16:15:56 2009
@@ -46,6 +46,7 @@
<li><code>org.apache.catalina.tribes.group.interceptors.MessageDispatchInterceptor</code></li>
<li><code>org.apache.catalina.tribes.group.interceptors.NonBlockingCoordinator</code></li>
<li><code>org.apache.catalina.tribes.group.interceptors.OrderInterceptor</code></li>
+
<li><code>org.apache.catalina.tribes.group.interceptors.SimpleCoordinator</code></li>
<li><code>org.apache.catalina.tribes.group.interceptors.StaticMembershipInterceptor</code></li>
<li><code>org.apache.catalina.tribes.group.interceptors.TwoPhaseCommitInterceptor</code></li>
<li><code>org.apache.catalina.tribes.group.interceptors.DomainFilterInterceptor</code></li>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
