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
commit 30b2ff85901fea21e0208cfb01113348d00ad870
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Aug 8 11:53:12 2023 +0100
Improvements to formatting prior to running automated reformatting.
---
.../apache/catalina/ha/backend/CollectedInfo.java | 10 +++++-----
.../apache/catalina/ha/session/DeltaManager.java | 21 +++++++++++----------
.../apache/catalina/ha/session/DeltaRequest.java | 3 ++-
.../apache/catalina/ha/session/SessionMessage.java | 18 +++++++++---------
4 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/java/org/apache/catalina/ha/backend/CollectedInfo.java
b/java/org/apache/catalina/ha/backend/CollectedInfo.java
index 00c39ed365..5d34b07192 100644
--- a/java/org/apache/catalina/ha/backend/CollectedInfo.java
+++ b/java/org/apache/catalina/ha/backend/CollectedInfo.java
@@ -62,11 +62,11 @@ public class CollectedInfo {
objName = oi.getObjectName();
String name = objName.getKeyProperty("name");
- /* Name are:
- * http-8080
- * jk-10.33.144.3-8009
- * jk-jfcpc%2F10.33.144.3-8009
- */
+ // Example names:
+ // ajp-nio-8009
+ // ajp-nio-127.0.0.1-8009
+ // ajp-nio-0:0:0:0:0:0:0:1-8009
+ // ajp-nio-10.36.116.209-8009
String [] elenames = name.split("-");
String sport = elenames[elenames.length-1];
iport = Integer.parseInt(sport);
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 403a7e9711..d796c4cadf 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -43,10 +43,10 @@ import org.apache.tomcat.util.res.StringManager;
* The DeltaManager manages replicated sessions by only replicating the deltas
* in data. For applications written to handle this, the DeltaManager is the
* optimal way of replicating data.
- *
+ * <p>
* This code is almost identical to StandardManager with a difference in how it
* persists sessions and some modifications to it.
- *
+ * <p>
* <b>IMPLEMENTATION NOTE </b>: Correct behavior of session storing and
* reloading depends upon external calls to the <code>start()</code> and
* <code>stop()</code> methods of this class at the correct times.
@@ -660,7 +660,9 @@ public class DeltaManager extends ClusterManagerBase{
/**
* Load sessions from other cluster node.
+ * <p>
* FIXME replace currently sessions with same id without notification.
+ * <p>
* FIXME SSO handling is not really correct with the session replacement!
* @param data Serialized data
* @exception ClassNotFoundException
@@ -1395,10 +1397,9 @@ public class DeltaManager extends ClusterManagerBase{
}
/**
- * handle receive that other node want all sessions ( restart )
- * a) send all sessions with one message
- * b) send session at blocks
- * After sending send state is complete transferred
+ * Handle a get all sessions message from another node. Depending on
{@link #sendAllSessions}, sessions are either
+ * sent in a single message or in batches. Sending is complete when this
method exits.
+ *
* @param msg Session message
* @param sender Member which sent the message
* @throws IOException IO error sending messages
@@ -1416,7 +1417,7 @@ public class DeltaManager extends ClusterManagerBase{
if (isSendAllSessions()) {
sendSessions(sender, currentSessions, findSessionTimestamp);
} else {
- // send session at blocks
+ // send sessions in batches
int remain = currentSessions.length;
for (int i = 0; i < currentSessions.length; i +=
getSendAllSessionsSize()) {
int len = i + getSendAllSessionsSize() >
currentSessions.length ?
@@ -1431,9 +1432,9 @@ public class DeltaManager extends ClusterManagerBase{
Thread.sleep(getSendAllSessionsWaitTime());
} catch (Exception sleep) {
}
- }//end if
- }//for
- }//end if
+ }
+ }
+ }
SessionMessage newmsg = new SessionMessageImpl(name,
SessionMessage.EVT_ALL_SESSION_TRANSFERCOMPLETE, null,
"SESSION-STATE-TRANSFERRED",
diff --git a/java/org/apache/catalina/ha/session/DeltaRequest.java
b/java/org/apache/catalina/ha/session/DeltaRequest.java
index 4246f3397b..50d5095ce6 100644
--- a/java/org/apache/catalina/ha/session/DeltaRequest.java
+++ b/java/org/apache/catalina/ha/session/DeltaRequest.java
@@ -34,7 +34,8 @@ import org.apache.tomcat.util.res.StringManager;
* This class is used to track the series of actions that happens when
* a request is executed. These actions will then translate into invocations
of methods
* on the actual session.
- * This class is NOT thread safe. One DeltaRequest per session
+ * <p>
+ * This class is NOT thread safe. One DeltaRequest per session.
*/
public class DeltaRequest implements Externalizable {
diff --git a/java/org/apache/catalina/ha/session/SessionMessage.java
b/java/org/apache/catalina/ha/session/SessionMessage.java
index 96dcc66fe0..8183ee653e 100644
--- a/java/org/apache/catalina/ha/session/SessionMessage.java
+++ b/java/org/apache/catalina/ha/session/SessionMessage.java
@@ -23,15 +23,15 @@ import org.apache.catalina.ha.ClusterMessage;
* <p>
* The following events are currently available:
* <ul>
- * <li><pre>public static final int EVT_SESSION_CREATED</pre><li>
- * <li><pre>public static final int EVT_SESSION_EXPIRED</pre><li>
- * <li><pre>public static final int EVT_SESSION_ACCESSED</pre><li>
- * <li><pre>public static final int EVT_GET_ALL_SESSIONS</pre><li>
- * <li><pre>public static final int EVT_SESSION_DELTA</pre><li>
- * <li><pre>public static final int EVT_ALL_SESSION_DATA</pre><li>
- * <li><pre>public static final int
EVT_ALL_SESSION_TRANSFERCOMPLETE</pre><li>
- * <li><pre>public static final int EVT_CHANGE_SESSION_ID</pre><li>
- * <li><pre>public static final int
EVT_ALL_SESSION_NOCONTEXTMANAGER</pre><li>
+ * <li>{@code public static final int EVT_SESSION_CREATED}</li>
+ * <li>{@code public static final int EVT_SESSION_EXPIRED}</li>
+ * <li>{@code public static final int EVT_SESSION_ACCESSED}</li>
+ * <li>{@code public static final int EVT_GET_ALL_SESSIONS}</li>
+ * <li>{@code public static final int EVT_SESSION_DELTA}</li>
+ * <li>{@code public static final int EVT_ALL_SESSION_DATA}</li>
+ * <li>{@code public static final int EVT_ALL_SESSION_TRANSFERCOMPLETE}</li>
+ * <li>{@code public static final int EVT_CHANGE_SESSION_ID}</li>
+ * <li>{@code public static final int EVT_ALL_SESSION_NOCONTEXTMANAGER}</li>
* </ul>
*/
public interface SessionMessage extends ClusterMessage {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
