[camel] branch master updated: Prevent an NPE during equality check on camel-sjms component (#4888)

[or...@apache.org]

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

orpiske pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new c2267a7  Prevent an NPE during equality check on camel-sjms component (#4888)
c2267a7 is described below

commit c2267a7148d37d26c925387c4221ae16837a349f
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Thu Jan 14 19:03:06 2021 +0100

    Prevent an NPE during equality check on camel-sjms component (#4888)
---
 .../java/org/apache/camel/component/sjms/TransactionOnCompletion.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionOnCompletion.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionOnCompletion.java
index 1bb5f78..a092403 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionOnCompletion.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionOnCompletion.java
@@ -59,6 +59,10 @@ class TransactionOnCompletion extends SynchronizationAdapter {
 
     @Override
     public boolean equals(Object o) {
+        if (o == null) {
+            return false;
+        }
+
         TransactionOnCompletion that = (TransactionOnCompletion) o;
         return session == that.session && message == that.message;
     }