[tomcat] branch 8.5.x updated: Remove useless null checks and add a sync for consistency

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm 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 3ec6fb6704 Remove useless null checks and add a sync for consistency
3ec6fb6704 is described below

commit 3ec6fb67045089798de8a373848fb0c6ce2834e5
Author: remm <r...@apache.org>
AuthorDate: Fri Sep 22 10:21:13 2023 +0200

    Remove useless null checks and add a sync for consistency
    
    Found by coverity.
---
 .../catalina/tribes/io/ReplicationStream.java      |  2 +-
 .../catalina/tribes/membership/MemberImpl.java     | 31 +++++++++++-----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/java/org/apache/catalina/tribes/io/ReplicationStream.java 
b/java/org/apache/catalina/tribes/io/ReplicationStream.java
index 9095a36f4b..079bb4ee03 100644
--- a/java/org/apache/catalina/tribes/io/ReplicationStream.java
+++ b/java/org/apache/catalina/tribes/io/ReplicationStream.java
@@ -105,7 +105,7 @@ public final class ReplicationStream extends 
ObjectInputStream {
             throws IOException, ClassNotFoundException {
 
         ClassLoader latestLoader;
-        if (classLoaders != null && classLoaders.length > 0) {
+        if (classLoaders.length > 0) {
             latestLoader = classLoaders[0];
         } else {
             latestLoader = null;
diff --git a/java/org/apache/catalina/tribes/membership/MemberImpl.java 
b/java/org/apache/catalina/tribes/membership/MemberImpl.java
index e2ae9239da..f4a301d3a7 100644
--- a/java/org/apache/catalina/tribes/membership/MemberImpl.java
+++ b/java/org/apache/catalina/tribes/membership/MemberImpl.java
@@ -403,18 +403,20 @@ public class MemberImpl implements Member, 
java.io.Externalizable {
         System.arraycopy(data, pos, payload, 0, payload.length);
         pos += payload.length;
 
-        member.setHost(addr);
-        member.setPort(XByteBuffer.toInt(portd, 0));
-        member.setSecurePort(XByteBuffer.toInt(sportd, 0));
-        member.setUdpPort(XByteBuffer.toInt(uportd, 0));
-        member.setMemberAliveTime(XByteBuffer.toLong(alived, 0));
-        member.setUniqueId(uniqueId);
-        member.payload = payload;
-        member.domain = domain;
-        member.command = command;
-
-        member.dataPkg = new byte[length];
-        System.arraycopy(data, offset, member.dataPkg, 0, length);
+        synchronized (member) {
+            member.setHost(addr);
+            member.setPort(XByteBuffer.toInt(portd, 0));
+            member.setSecurePort(XByteBuffer.toInt(sportd, 0));
+            member.setUdpPort(XByteBuffer.toInt(uportd, 0));
+            member.setMemberAliveTime(XByteBuffer.toLong(alived, 0));
+            member.setUniqueId(uniqueId);
+            member.payload = payload;
+            member.domain = domain;
+            member.command = command;
+
+            member.dataPkg = new byte[length];
+            System.arraycopy(data, offset, member.dataPkg, 0, length);
+        }
 
         return member;
     }
@@ -622,10 +624,7 @@ public class MemberImpl implements Member, 
java.io.Externalizable {
     @Override
     public synchronized void setPayload(byte[] payload) {
         // longs to avoid any possibility of overflow
-        long oldPayloadLength = 0;
-        if (this.payload != null) {
-            oldPayloadLength = this.payload.length;
-        }
+        long oldPayloadLength = this.payload.length;
         long newPayloadLength = 0;
         if (payload != null) {
             newPayloadLength = payload.length;


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org