From a9d742db328b20c35ee78c4fc329a3bcb45768fe Mon Sep 17 00:00:00 2001 From: Karthik Vishwamurthy Date: Fri, 7 Nov 2025 11:05:10 +0100 Subject: [PATCH 1/2] QPIDJMS-616: enhance error message to include additional info from errorCondition --- .../java/org/apache/qpid/jms/provider/amqp/AmqpSupport.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSupport.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSupport.java index eec4bd374..d7465766f 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSupport.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSupport.java @@ -207,6 +207,11 @@ public static String extractErrorMessage(ErrorCondition errorCondition) { if (condition != null) { message = message + " [condition = " + condition + "]"; } + + Map info = errorCondition.getInfo(); + if (info != null && !info.isEmpty()) { + message = message + " [info = " + info + "]"; + } } return message; From 03ac2ef8230b1c1da9585bb8517dbdaa4479c2ba Mon Sep 17 00:00:00 2001 From: Karthik Vishwamurthy Date: Fri, 7 Nov 2025 13:42:21 +0100 Subject: [PATCH 2/2] more change --- .../apache/qpid/jms/provider/amqp/AmqpSupport.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSupport.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSupport.java index d7465766f..4c2a906ca 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSupport.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSupport.java @@ -208,9 +208,16 @@ public static String extractErrorMessage(ErrorCondition errorCondition) { message = message + " [condition = " + condition + "]"; } - Map info = errorCondition.getInfo(); - if (info != null && !info.isEmpty()) { - message = message + " [info = " + info + "]"; + try { + Map info = errorCondition.getInfo(); + String messageWithInfo = message; + if (info != null && !info.isEmpty()) { + messageWithInfo = message + " [info = " + info + "]"; + } + return messageWithInfo; + } + catch (Exception e) { + return message; } }