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 c9eb9e6d72b9e73f040966c4ccc81174555624a6
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue May 21 13:38:08 2019 +0100
Extra fixes for https://bz.apache.org/bugzilla/show_bug.cgi?id=62841
Thanks to kfujino's review
---
java/org/apache/catalina/ha/session/DeltaManager.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 45588ae..abfad42 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -591,7 +591,12 @@ public class DeltaManager extends ClusterManagerBase{
* @param deltaRequest The request to serialize
* @return serialized delta request
* @throws IOException IO error with serialization
+ *
+ * @deprecated Unused. This will be removed in Tomcat 10.
+ * Calling this method may result in a deadlock. See:
+ * https://bz.apache.org/bugzilla/show_bug.cgi?id=62841
*/
+ @Deprecated
protected byte[] serializeDeltaRequest(DeltaSession session, DeltaRequest
deltaRequest)
throws IOException {
session.lock();
@@ -981,7 +986,7 @@ public class DeltaManager extends ClusterManagerBase{
deltaRequest = session.replaceDeltaRequest(newDeltaRequest);
if (deltaRequest.getSize() > 0) {
counterSend_EVT_SESSION_DELTA++;
- byte[] data = serializeDeltaRequest(session,deltaRequest);
+ byte[] data = deltaRequest.serialize();
msg = new SessionMessageImpl(getName(),
SessionMessage.EVT_SESSION_DELTA,
data,
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
