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 8551008 Extra fixes for https://bz.apache.org/bugzilla/show_bug.cgi?id=62841 8551008 is described below commit 855100831fc3d2077dfcf930c3da6ef40614d8fd 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 7f0df95..136c549 100644 --- a/java/org/apache/catalina/ha/session/DeltaManager.java +++ b/java/org/apache/catalina/ha/session/DeltaManager.java @@ -585,7 +585,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(); @@ -973,7 +978,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