Author: markt
Date: Fri Jul 13 22:04:25 2012
New Revision: 1361416
URL: http://svn.apache.org/viewvc?rev=1361416&view=rev
Log:
UCDetector clean-up
- Remove unused code
- Use final where appropriate
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
tomcat/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java
tomcat/trunk/java/org/apache/catalina/ha/session/SessionIDMessage.java
tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java?rev=1361416&r1=1361415&r2=1361416&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java Fri Jul
13 22:04:25 2012
@@ -49,7 +49,7 @@ public class BackupManager extends Clust
*/
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
- protected static long DEFAULT_REPL_TIMEOUT = 15000;//15 seconds
+ protected static final long DEFAULT_REPL_TIMEOUT = 15000;//15 seconds
/** Set to true if we don't want the sessions to expire on shutdown */
protected boolean mExpireSessionsOnShutdown = true;
@@ -161,10 +161,9 @@ public class BackupManager extends Clust
}
}
cluster.registerManager(this);
- LazyReplicatedMap<String,Session> map =
- new LazyReplicatedMap<String,Session>(this,
- cluster.getChannel(), rpcTimeout, getMapName(),
- getClassLoaders());
+ LazyReplicatedMap<String,Session> map = new LazyReplicatedMap<>(
+ this, cluster.getChannel(), rpcTimeout, getMapName(),
+ getClassLoaders());
map.setChannelSendOptions(mapSendOptions);
this.sessions = map;
} catch ( Exception x ) {
@@ -259,7 +258,7 @@ public class BackupManager extends Clust
@Override
public Set<String> getSessionIdsFull() {
- Set<String> sessionIds = new HashSet<String>();
+ Set<String> sessionIds = new HashSet<>();
LazyReplicatedMap<String,Session> map =
(LazyReplicatedMap<String,Session>)sessions;
Iterator<String> keys = map.keySetFull().iterator();
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1361416&r1=1361415&r2=1361416&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Fri Jul
13 22:04:25 2012
@@ -80,7 +80,7 @@ public class DeltaManager extends Cluste
/**
* The descriptive name of this Manager implementation (for logging).
*/
- protected static String managerName = "DeltaManager";
+ protected static final String managerName = "DeltaManager";
protected String name = null;
/**
@@ -101,8 +101,8 @@ public class DeltaManager extends Cluste
* wait time between send session block (default 2 sec)
*/
private int sendAllSessionsWaitTime = 2 * 1000 ;
- private ArrayList<SessionMessage> receivedMessageQueue =
- new ArrayList<SessionMessage>() ;
+ private final ArrayList<SessionMessage> receivedMessageQueue =
+ new ArrayList<>();
private boolean receiverQueue = false ;
private boolean stateTimestampDrop = true ;
private long stateTransferCreateSendTime;
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java?rev=1361416&r1=1361415&r2=1361416&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java Fri Jul
13 22:04:25 2012
@@ -64,9 +64,8 @@ public class DeltaRequest implements Ext
public static final String NAME_AUTHTYPE = "__SET__AUTHTYPE__";
private String sessionId;
- private LinkedList<AttributeInfo> actions = new
LinkedList<AttributeInfo>();
- private LinkedList<AttributeInfo> actionPool =
- new LinkedList<AttributeInfo>();
+ private LinkedList<AttributeInfo> actions = new LinkedList<>();
+ private final LinkedList<AttributeInfo> actionPool = new LinkedList<>();
private boolean recordAllActions = false;
@@ -249,7 +248,7 @@ public class DeltaRequest implements Ext
recordAllActions = in.readBoolean();
int cnt = in.readInt();
if (actions == null)
- actions = new LinkedList<AttributeInfo>();
+ actions = new LinkedList<>();
else
actions.clear();
for (int i = 0; i < cnt; i++) {
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=1361416&r1=1361415&r2=1361416&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Fri Jul
13 22:04:25 2012
@@ -729,7 +729,7 @@ public class DeltaSession extends Standa
if (log.isDebugEnabled())
log.debug(sm.getString("deltaSession.readSession", id));
// Deserialize the attribute count and attribute values
- if (attributes == null) attributes = new ConcurrentHashMap<String,
Object>();
+ if (attributes == null) attributes = new ConcurrentHashMap<>();
int n = ( (Integer) stream.readObject()).intValue();
boolean isValidSave = isValid;
isValid = true;
@@ -743,13 +743,12 @@ public class DeltaSession extends Standa
isValid = isValidSave;
if (listeners == null) {
- ArrayList<SessionListener> arrayList =
- new ArrayList<SessionListener>();
+ ArrayList<SessionListener> arrayList = new ArrayList<>();
listeners = arrayList;
}
if (notes == null) {
- notes = new Hashtable<String,Object>();
+ notes = new Hashtable<>();
}
activate();
}
@@ -810,8 +809,8 @@ public class DeltaSession extends Standa
// Accumulate the names of serializable and non-serializable attributes
String keys[] = keys();
- ArrayList<String> saveNames = new ArrayList<String>();
- ArrayList<Object> saveValues = new ArrayList<Object>();
+ ArrayList<String> saveNames = new ArrayList<>();
+ ArrayList<Object> saveValues = new ArrayList<>();
for (int i = 0; i < keys.length; i++) {
Object value = null;
value = attributes.get(keys[i]);
@@ -839,15 +838,8 @@ public class DeltaSession extends Standa
}
- // -------------------------------------------------------- Private Methods
-
- /**
- * Return the value of an attribute without a check for validity.
- */
- protected Object getAttributeInternal(String name) {
- return (attributes.get(name));
- }
+ // -------------------------------------------------------- Private Methods
protected void removeAttributeInternal(String name, boolean notify,
boolean addDeltaRequest) {
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java?rev=1361416&r1=1361415&r2=1361416&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteSessionIDBinderListener.java
Fri Jul 13 22:04:25 2012
@@ -51,11 +51,6 @@ public class JvmRouteSessionIDBinderList
protected boolean started = false;
- /**
- * number of session that goes to this cluster node
- */
- private long numberOfSessions = 0;
-
//--Constructor---------------------------------------------
public JvmRouteSessionIDBinderListener() {
@@ -65,13 +60,6 @@ public class JvmRouteSessionIDBinderList
//--Logic---------------------------------------------------
/**
- * @return Returns the numberOfSessions.
- */
- public long getNumberOfSessions() {
- return numberOfSessions;
- }
-
- /**
* Add this Mover as Cluster Listener ( receiver)
*
* @throws LifecycleException
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java?rev=1361416&r1=1361415&r2=1361416&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java
Fri Jul 13 22:04:25 2012
@@ -55,40 +55,6 @@ public class SerializablePrincipal impl
// ----------------------------------------------------------- Constructors
- public SerializablePrincipal() {
- super();
- }
-
-
- /**
- * Construct a new Principal, associated with the specified Realm, for the
- * specified username and password.
- *
- * @param name The username of the user represented by this Principal
- * @param password Credentials used to authenticate this user
- */
- public SerializablePrincipal(String name, String password) {
-
- this(name, password, null);
-
- }
-
-
- /**
- * Construct a new Principal, associated with the specified Realm, for the
- * specified username and password, with the specified role names
- * (as Strings).
- *
- * @param name The username of the user represented by this Principal
- * @param password Credentials used to authenticate this user
- * @param roles List of roles (must be Strings) possessed by this user
- */
- public SerializablePrincipal(String name, String password,
- List<String> roles) {
- this(name, password, roles, null);
- }
-
-
/**
* Construct a new Principal, associated with the specified Realm, for the
* specified username and password, with the specified role names
@@ -105,14 +71,17 @@ public class SerializablePrincipal impl
super();
this.name = name;
this.password = password;
- if (roles != null) {
- this.roles = new String[roles.size()];
- this.roles = roles.toArray(this.roles);
+ if (roles == null) {
+ this.roles = new String[0];
+ } else {
+ this.roles = roles.toArray(new String[roles.size()]);
if (this.roles.length > 1)
Arrays.sort(this.roles);
}
if (userPrincipal instanceof Serializable) {
this.userPrincipal = userPrincipal;
+ } else {
+ this.userPrincipal = null;
}
}
@@ -123,7 +92,7 @@ public class SerializablePrincipal impl
/**
* The username of the user represented by this Principal.
*/
- protected String name = null;
+ protected final String name;
public String getName() {
return (this.name);
@@ -134,7 +103,7 @@ public class SerializablePrincipal impl
* The authentication credentials for the user represented by
* this Principal.
*/
- protected String password = null;
+ protected final String password;
public String getPassword() {
return (this.password);
@@ -158,7 +127,7 @@ public class SerializablePrincipal impl
/**
* The set of roles associated with this user.
*/
- protected String roles[] = new String[0];
+ protected final String roles[];
public String[] getRoles() {
return (this.roles);
@@ -168,7 +137,7 @@ public class SerializablePrincipal impl
/**
* The user principal, if present.
*/
- protected Principal userPrincipal = null;
+ protected final Principal userPrincipal;
// --------------------------------------------------------- Public Methods
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/SessionIDMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/SessionIDMessage.java?rev=1361416&r1=1361415&r2=1361416&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/SessionIDMessage.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/SessionIDMessage.java Fri
Jul 13 22:04:25 2012
@@ -27,9 +27,7 @@ import org.apache.catalina.ha.ClusterMes
*/
public class SessionIDMessage extends ClusterMessageBase {
- private static final long serialVersionUID = 1L;
-
- private int messageNumber;
+ private static final long serialVersionUID = 2L;
private String orignalSessionID;
@@ -46,8 +44,6 @@ public class SessionIDMessage extends Cl
result.append("#-#");
result.append(getContextName());
result.append("#-#");
- result.append(getMessageNumber());
- result.append("#-#");
result.append(System.currentTimeMillis());
return result.toString();
}
@@ -78,20 +74,6 @@ public class SessionIDMessage extends Cl
public void setContextName(String contextName) {
this.contextName = contextName;
}
- /**
- * @return Returns the messageNumber.
- */
- public int getMessageNumber() {
- return messageNumber;
- }
-
- /**
- * @param messageNumber
- * The messageNumber to set.
- */
- public void setMessageNumber(int messageNumber) {
- this.messageNumber = messageNumber;
- }
/**
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java?rev=1361416&r1=1361415&r2=1361416&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java
Fri Jul 13 22:04:25 2012
@@ -29,22 +29,17 @@ import org.apache.catalina.ha.ClusterMes
*/
public class SessionMessageImpl extends ClusterMessageBase implements
SessionMessage {
- private static final long serialVersionUID = 1L;
-
-
- public SessionMessageImpl() {
- }
+ private static final long serialVersionUID = 2L;
/*
-
* Private serializable variables to keep the messages state
*/
- private int mEvtType = -1;
- private byte[] mSession;
- private String mSessionID;
+ private final int mEvtType;
+ private final byte[] mSession;
+ private final String mSessionID;
- private String mContextName;
+ private final String mContextName;
private long serializationTimestamp;
private boolean timestampSet = false ;
private String uniqueId;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
