OF-2611: Add context to StreamError when no message is provided.

igniterealtime · Jul 20, 2023 · 6974911 · 6974911
1 parent b371674
commit 6974911
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/StreamErrorException.java b/xmppserver/src/main/java/org/jivesoftware/util/StreamErrorException.java
@@ -45,7 +45,7 @@ public StreamErrorException(StreamError.Condition condition, String message, Thr
 
     public StreamErrorException(StreamError.Condition condition, Throwable cause)
     {
-        super(cause);
+        super(condition.name(), cause);
         this.streamError = new StreamError(condition);
     }
 
@@ -57,6 +57,7 @@ public StreamErrorException(StreamError.Condition condition, String message, Thr
 
     public StreamErrorException(StreamError streamError)
     {
+        super(streamError != null && !streamError.getText().isEmpty() ? streamError.getText() : null);
         this.streamError = streamError;
     }
 
@@ -74,7 +75,7 @@ public StreamErrorException(StreamError streamError, String message, Throwable c
 
     public StreamErrorException(StreamError streamError, Throwable cause)
     {
-        super(cause);
+        super(streamError != null && !streamError.getText().isEmpty() ? streamError.getText() : null, cause);
         this.streamError = streamError;
     }