This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new d6d3b31 Review o.a.catalina.ha.session and minimise diff
d6d3b31 is described below
commit d6d3b31d7ac461933f30bc6b0a36af777657299e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 23 13:04:09 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.
---
.../org/apache/catalina/ha/session/ClusterSessionListener.java | 1 -
java/org/apache/catalina/ha/session/DeltaManager.java | 10 +++++-----
java/org/apache/catalina/ha/session/DeltaSession.java | 8 ++++----
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/catalina/ha/session/ClusterSessionListener.java
b/java/org/apache/catalina/ha/session/ClusterSessionListener.java
index c2c36b4..8836854 100644
--- a/java/org/apache/catalina/ha/session/ClusterSessionListener.java
+++ b/java/org/apache/catalina/ha/session/ClusterSessionListener.java
@@ -88,7 +88,6 @@ public class ClusterSessionListener extends ClusterListener {
cluster.send(replymsg, msg.getAddress());
}
}
-
}
}
}
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 3ee3fbe..54a1e5d 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -473,6 +473,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.
@@ -856,7 +857,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)));
}
}
@@ -1017,7 +1018,7 @@ public class DeltaManager extends ClusterManagerBase{
sessionId + "-" +
System.currentTimeMillis());
if (log.isDebugEnabled()) {
log.debug(sm.getString("deltaManager.createMessage.access",
- getName(),sessionId));
+ getName(), sessionId));
}
}
}
@@ -1104,7 +1105,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);
}
@@ -1122,13 +1123,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/DeltaSession.java
b/java/org/apache/catalina/ha/session/DeltaSession.java
index 4147fc0..947fa62 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -341,7 +341,7 @@ public class DeltaSession extends StandardSession
implements Externalizable,Clus
lockInternal();
try {
deltaRequest.setMaxInactiveInterval(interval);
- } finally{
+ } finally {
unlockInternal();
}
}
@@ -364,7 +364,7 @@ public class DeltaSession extends StandardSession
implements Externalizable,Clus
lockInternal();
try {
deltaRequest.setNew(isNew);
- } finally{
+ } finally {
unlockInternal();
}
}
@@ -531,7 +531,7 @@ public class DeltaSession extends StandardSession
implements Externalizable,Clus
try {
super.recycle();
deltaRequest.clear();
- } finally{
+ } finally {
unlockInternal();
}
}
@@ -591,7 +591,7 @@ public class DeltaSession extends StandardSession
implements Externalizable,Clus
lockInternal();
try {
readObjectData(in);
- } finally{
+ } finally {
unlockInternal();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
