This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 815c6a89dd Remove useless null checks and add a sync for consistency
815c6a89dd is described below
commit 815c6a89dd55bdc7e9767b07018f62d7622d0c77
Author: remm <[email protected]>
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 70265fd826..0cfeb65199 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 4002686f38..1f95405808 100644
--- a/java/org/apache/catalina/tribes/membership/MemberImpl.java
+++ b/java/org/apache/catalina/tribes/membership/MemberImpl.java
@@ -394,18 +394,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;
}
@@ -605,10 +607,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: [email protected]
For additional commands, e-mail: [email protected]
