svn commit: r1361400 - in /tomcat/trunk/java/org/apache/catalina/ha/authenticator: ClusterSingleSignOn.java ClusterSingleSignOnListener.java SingleSignOnMessage.java

[markt]

Author: markt
Date: Fri Jul 13 20:59:08 2012
New Revision: 1361400

URL: http://svn.apache.org/viewvc?rev=1361400&view=rev
Log:
UCDetector clean-up
 - Remove unused code
 - Use final where appropriate

Modified:
    
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
    
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
    
tomcat/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java?rev=1361400&r1=1361399&r2=1361400&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java 
Fri Jul 13 20:59:08 2012
@@ -87,8 +87,7 @@ public class ClusterSingleSignOn extends
     @Override
     protected synchronized void startInternal() throws LifecycleException {
 
-        clusterSSOListener = new ClusterSingleSignOnListener();
-        clusterSSOListener.setClusterSSO(this);
+        clusterSSOListener = new ClusterSingleSignOnListener(this);
 
         // Load the cluster component, if any
         try {

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java?rev=1361400&r1=1361399&r2=1361400&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOnListener.java
 Fri Jul 13 20:59:08 2012
@@ -40,30 +40,15 @@ public class ClusterSingleSignOnListener
 
     // ------------------------------------------------------------- Properties
 
-    private ClusterSingleSignOn clusterSSO = null;
+    private final ClusterSingleSignOn clusterSSO;
 
 
     //--Constructor---------------------------------------------
 
-    public ClusterSingleSignOnListener() {
-        // NO-OP
-    }
-
-    //--Logic---------------------------------------------------
-
-    public ClusterSingleSignOn getClusterSSO() {
-
-        return clusterSSO;
-
-    }
-
-    public void setClusterSSO(ClusterSingleSignOn clusterSSO) {
-
+    public ClusterSingleSignOnListener(ClusterSingleSignOn clusterSSO) {
         this.clusterSSO = clusterSSO;
-
     }
 
-
     /**
      * Callback from the cluster, when a message is received, The cluster will
      * broadcast it invoking the messageReceived on the receiver.

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java?rev=1361400&r1=1361399&r2=1361400&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java 
Fri Jul 13 20:59:08 2012
@@ -37,10 +37,11 @@ public class SingleSignOnMessage impleme
     public static final int UPDATE_SESSION = 5;
     public static final int REMOVE_SESSION = 6;
 
+    private final String ssoId;
+    private final String sessionId;
+
     private int action = -1;
-    private String ssoId = null;
     private String ctxname = null;
-    private String sessionId = null;
     private String authType = null;
     private String password = null;
     private String username = null;
@@ -133,10 +134,6 @@ public class SingleSignOnMessage impleme
         return ssoId;
     }
 
-    public void setSsoId(String ssoId) {
-        this.ssoId = ssoId;
-    }
-
     public String getContextName() {
         return ctxname;
     }
@@ -149,10 +146,6 @@ public class SingleSignOnMessage impleme
         return sessionId;
     }
 
-    public void setSessionId(String sessionId) {
-        this.sessionId = sessionId;
-    }
-
     public String getAuthType() {
         return authType;
     }



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