(cassandra-java-driver) branch 3.x updated: CASSJAVA-85: decode custom payload and warnings in correct order

[tolbertam]

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

tolbertam pushed a commit to branch 3.x
in repository https://gitbox.apache.org/repos/asf/cassandra-java-driver.git


The following commit(s) were added to refs/heads/3.x by this push:
     new 2b8b221b5 CASSJAVA-85: decode custom payload and warnings in correct 
order
2b8b221b5 is described below

commit 2b8b221b5f40bec2c2a85fa9f55341feaa1f5531
Author: tommy stendahl <tommy.stend...@ericsson.com>
AuthorDate: Fri Feb 28 11:16:26 2025 +0100

    CASSJAVA-85: decode custom payload and warnings in correct order
    
    patch by Tommy Stendahl; reviewed by Alexandre Dutra and Andy Tolbert for 
CASSJAVA-85
---
 driver-core/src/main/java/com/datastax/driver/core/Message.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/driver-core/src/main/java/com/datastax/driver/core/Message.java 
b/driver-core/src/main/java/com/datastax/driver/core/Message.java
index 617a8a0fd..05e9ef350 100644
--- a/driver-core/src/main/java/com/datastax/driver/core/Message.java
+++ b/driver-core/src/main/java/com/datastax/driver/core/Message.java
@@ -274,8 +274,13 @@ abstract class Message {
     protected void decode(ChannelHandlerContext ctx, Frame frame, List<Object> 
out)
         throws Exception {
       boolean isTracing = 
frame.header.flags.contains(Frame.Header.Flag.TRACING);
+      boolean hasWarnings = 
frame.header.flags.contains(Frame.Header.Flag.WARNING);
       boolean isCustomPayload = 
frame.header.flags.contains(Frame.Header.Flag.CUSTOM_PAYLOAD);
       UUID tracingId = isTracing ? CBUtil.readUUID(frame.body) : null;
+
+      List<String> warnings =
+          hasWarnings ? CBUtil.readStringList(frame.body) : 
Collections.<String>emptyList();
+
       Map<String, ByteBuffer> customPayload =
           isCustomPayload ? CBUtil.readBytesMap(frame.body) : null;
 
@@ -286,10 +291,6 @@ abstract class Message {
             CBUtil.sizeOfBytesMap(customPayload));
       }
 
-      boolean hasWarnings = 
frame.header.flags.contains(Frame.Header.Flag.WARNING);
-      List<String> warnings =
-          hasWarnings ? CBUtil.readStringList(frame.body) : 
Collections.<String>emptyList();
-
       try {
         CodecRegistry codecRegistry = 
ctx.channel().attr(CODEC_REGISTRY_ATTRIBUTE_KEY).get();
         assert codecRegistry != null;


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