This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new c6b3a97 Review o.a.catalina.ha.session and minimise diff
c6b3a97 is described below
commit c6b3a979f99aac09712b930a73d31acfd54b0975
Author: Mark Thomas <[email protected]>
AuthorDate: Thu May 23 13:06:28 2019 +0100
Review o.a.catalina.ha.session and minimise diff
First pass at reducing diff between 9.0.x. 8.5.x and 7.0.x to simplify
backports. Mostly whitespace and NO-OP refactorings.
---
.../catalina/ha/session/ClusterSessionListener.java | 4 +---
java/org/apache/catalina/ha/session/DeltaManager.java | 19 ++++++++-----------
java/org/apache/catalina/ha/session/DeltaRequest.java | 6 ++----
java/org/apache/catalina/ha/session/DeltaSession.java | 18 ++++++++++--------
4 files changed, 21 insertions(+), 26 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/ClusterSessionListener.java
b/java/org/apache/catalina/ha/session/ClusterSessionListener.java
index e9f5d28..8836854 100644
--- a/java/org/apache/catalina/ha/session/ClusterSessionListener.java
+++ b/java/org/apache/catalina/ha/session/ClusterSessionListener.java
@@ -88,10 +88,8 @@ public class ClusterSessionListener extends ClusterListener {
cluster.send(replymsg, msg.getAddress());
}
}
-
}
}
- return;
}
/**
@@ -105,7 +103,7 @@ public class ClusterSessionListener extends ClusterListener
{
*/
@Override
public boolean accept(ClusterMessage msg) {
- return (msg instanceof SessionMessage);
+ return msg instanceof SessionMessage;
}
}
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index cce8840..21c6efa 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -24,7 +24,6 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.Date;
-import java.util.Iterator;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
@@ -303,7 +302,7 @@ public class DeltaManager extends ClusterManagerBase{
/**
* Set that state transferred is complete
- * @param stateTransfered Fag value
+ * @param stateTransfered Flag value
*/
public void setStateTransfered(boolean stateTransfered) {
this.stateTransfered = stateTransfered;
@@ -432,7 +431,7 @@ public class DeltaManager extends ClusterManagerBase{
if (log.isDebugEnabled())
log.debug(sm.getString("deltaManager.createSession.newSession",
session.getId(), Integer.valueOf(sessions.size())));
- return (session);
+ return session;
}
/**
@@ -479,6 +478,7 @@ public class DeltaManager extends ClusterManagerBase{
/**
* Get new session class to be used in the doLoad() method.
+ *
* @return a new session
*
* @deprecated Unused. This will be removed in Tomcat 10.
@@ -775,9 +775,7 @@ public class DeltaManager extends ClusterManagerBase{
waitForSendAllSessions(beforeSendTime);
} finally {
synchronized(receivedMessageQueue) {
- for (Iterator<SessionMessage> iter =
receivedMessageQueue.iterator();
- iter.hasNext();) {
- SessionMessage smsg = iter.next();
+ for (SessionMessage smsg : receivedMessageQueue) {
if (!stateTimestampDrop) {
messageReceived(smsg, smsg.getAddress());
} else {
@@ -864,7 +862,7 @@ public class DeltaManager extends ClusterManagerBase{
new Date(beforeSendTime), Long.valueOf(reqNow -
beforeSendTime)));
} else {
if (log.isInfoEnabled())
- log.info(sm.getString("deltaManager.sessionReceived",getName(),
+ log.info(sm.getString("deltaManager.sessionReceived",
getName(),
new Date(beforeSendTime), Long.valueOf(reqNow -
beforeSendTime)));
}
}
@@ -1025,7 +1023,7 @@ public class DeltaManager extends ClusterManagerBase{
sessionId + "-" +
System.currentTimeMillis());
if (log.isDebugEnabled()) {
log.debug(sm.getString("deltaManager.createMessage.access",
- getName(),sessionId));
+ getName(), sessionId));
}
}
}
@@ -1112,7 +1110,7 @@ public class DeltaManager extends ClusterManagerBase{
int expireDirect = 0 ;
int expireIndirect = 0 ;
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Start expire all sessions " + getName() + " at " +
timeNow +
" sessioncount " + sessions.length);
}
@@ -1130,13 +1128,12 @@ public class DeltaManager extends ClusterManagerBase{
}//end if
}//for
long timeEnd = System.currentTimeMillis();
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("End expire sessions " + getName() +
" expire processingTime " + (timeEnd - timeNow) +
" expired direct sessions: " + expireDirect +
" expired direct sessions: " + expireIndirect);
}
-
}
@Override
diff --git a/java/org/apache/catalina/ha/session/DeltaRequest.java
b/java/org/apache/catalina/ha/session/DeltaRequest.java
index c5c5a57..6491e15 100644
--- a/java/org/apache/catalina/ha/session/DeltaRequest.java
+++ b/java/org/apache/catalina/ha/session/DeltaRequest.java
@@ -86,13 +86,11 @@ public class DeltaRequest implements Externalizable {
}
public void removeAttribute(String name) {
- int action = ACTION_REMOVE;
- addAction(TYPE_ATTRIBUTE,action,name,null);
+ addAction(TYPE_ATTRIBUTE, ACTION_REMOVE, name, null);
}
public void setMaxInactiveInterval(int interval) {
- int action = ACTION_SET;
-
addAction(TYPE_MAXINTERVAL,action,NAME_MAXINTERVAL,Integer.valueOf(interval));
+ addAction(TYPE_MAXINTERVAL, ACTION_SET, NAME_MAXINTERVAL,
Integer.valueOf(interval));
}
/**
diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java
b/java/org/apache/catalina/ha/session/DeltaSession.java
index 72a93ca..947fa62 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -28,6 +28,7 @@ import java.io.WriteAbortedException;
import java.security.Principal;
import java.util.ArrayList;
import java.util.Hashtable;
+import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Lock;
@@ -340,7 +341,7 @@ public class DeltaSession extends StandardSession
implements Externalizable,Clus
lockInternal();
try {
deltaRequest.setMaxInactiveInterval(interval);
- } finally{
+ } finally {
unlockInternal();
}
}
@@ -363,7 +364,7 @@ public class DeltaSession extends StandardSession
implements Externalizable,Clus
lockInternal();
try {
deltaRequest.setNew(isNew);
- } finally{
+ } finally {
unlockInternal();
}
}
@@ -447,7 +448,8 @@ public class DeltaSession extends StandardSession
implements Externalizable,Clus
}
}
}
- return (this.isValid);
+
+ return this.isValid;
}
/**
@@ -529,7 +531,7 @@ public class DeltaSession extends StandardSession
implements Externalizable,Clus
try {
super.recycle();
deltaRequest.clear();
- } finally{
+ } finally {
unlockInternal();
}
}
@@ -544,7 +546,7 @@ public class DeltaSession extends StandardSession
implements Externalizable,Clus
sb.append("DeltaSession[");
sb.append(id);
sb.append("]");
- return (sb.toString());
+ return sb.toString();
}
@Override
@@ -589,7 +591,7 @@ public class DeltaSession extends StandardSession
implements Externalizable,Clus
lockInternal();
try {
readObjectData(in);
- } finally{
+ } finally {
unlockInternal();
}
}
@@ -920,8 +922,8 @@ public class DeltaSession extends StandardSession
implements Externalizable,Clus
// Accumulate the names of serializable and non-serializable attributes
String keys[] = keys();
- ArrayList<String> saveNames = new ArrayList<>();
- ArrayList<Object> saveValues = new ArrayList<>();
+ List<String> saveNames = new ArrayList<>();
+ List<Object> saveValues = new ArrayList<>();
for (int i = 0; i < keys.length; i++) {
Object value = null;
value = attributes.get(keys[i]);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
