Author: kfujino
Date: Thu Jan 31 07:56:25 2013
New Revision: 1440871

URL: http://svn.apache.org/viewvc?rev=1440871&view=rev
Log:
Check cluster member before sending replicate message in ClusterSingleSignOn.

Modified:
    
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java?rev=1440871&r1=1440870&r2=1440871&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
 Thu Jan 31 07:56:25 2013
@@ -193,7 +193,7 @@ public class ClusterSingleSignOn
     @Override
     protected void associate(String ssoId, Session session) {
 
-        if (cluster != null) {
+        if (cluster != null && cluster.getMembers().length > 0) {
             messageNumber++;
             SingleSignOnMessage msg =
                 new SingleSignOnMessage(cluster.getLocalMember(),
@@ -233,7 +233,7 @@ public class ClusterSingleSignOn
     @Override
     protected void deregister(String ssoId, Session session) {
 
-        if (cluster != null) {
+        if (cluster != null && cluster.getMembers().length > 0) {
             messageNumber++;
             SingleSignOnMessage msg =
                 new SingleSignOnMessage(cluster.getLocalMember(),
@@ -271,7 +271,7 @@ public class ClusterSingleSignOn
     @Override
     protected void deregister(String ssoId) {
 
-        if (cluster != null) {
+        if (cluster != null && cluster.getMembers().length > 0) {
             messageNumber++;
             SingleSignOnMessage msg =
                 new SingleSignOnMessage(cluster.getLocalMember(),
@@ -310,7 +310,7 @@ public class ClusterSingleSignOn
     protected void register(String ssoId, Principal principal, String authType,
                   String username, String password) {
 
-        if (cluster != null) {
+        if (cluster != null && cluster.getMembers().length > 0) {
             messageNumber++;
             SingleSignOnMessage msg =
                 new SingleSignOnMessage(cluster.getLocalMember(),
@@ -374,7 +374,7 @@ public class ClusterSingleSignOn
     protected void update(String ssoId, Principal principal, String authType,
                           String username, String password) {
 
-        if (cluster != null) {
+        if (cluster != null && cluster.getMembers().length > 0) {
             messageNumber++;
             SingleSignOnMessage msg =
                 new SingleSignOnMessage(cluster.getLocalMember(),
@@ -418,7 +418,7 @@ public class ClusterSingleSignOn
     @Override
     protected void removeSession(String ssoId, Session session) {
 
-        if (cluster != null) {
+        if (cluster != null && cluster.getMembers().length > 0) {
             messageNumber++;
             SingleSignOnMessage msg =
                 new SingleSignOnMessage(cluster.getLocalMember(),

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1440871&r1=1440870&r2=1440871&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jan 31 07:56:25 2013
@@ -149,6 +149,10 @@
         Prevent SSO deregister when node shutdown normally in cluster
         environment. (kfujino)
       </fix>
+      <fix>
+        Check cluster member before sending replicate message in
+        ClusterSingleSignOn. (kfujino)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Web applications">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to