[camel] branch main updated: Fixed string comparison with == and added TODO for an alert from Findbugs (#5755)

[davsclaus]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 7391a05  Fixed string comparison with == and added TODO for an alert 
from Findbugs (#5755)
7391a05 is described below

commit 7391a0525ccfe7df4a0493db5ce5f1e1cfdf6f8c
Author: dk2k <d...@users.noreply.github.com>
AuthorDate: Sun Jun 27 13:49:24 2021 +0300

    Fixed string comparison with == and added TODO for an alert from Findbugs 
(#5755)
    
    * Respect the user's intention to send content-type header without appended 
charset:
    "application/edifact"
    
    * AS2 server: currently there is no means to specify custom MDN template
    MDN template from configuration is ignored.
    
    * Fixed minor issue related to string comparison and added TODO (don't know 
how to fix)
    
    Co-authored-by: Dmitry Kriukov <d...@ya.ru>
---
 .../java/org/apache/camel/component/as2/api/AS2ServerConnection.java | 2 ++
 .../org/apache/camel/component/as2/api/protocol/ResponseMDN.java     | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ServerConnection.java
 
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ServerConnection.java
index 6cbb0d9..1098dd9 100644
--- 
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ServerConnection.java
+++ 
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ServerConnection.java
@@ -232,6 +232,8 @@ public class AS2ServerConnection {
                 } catch (IOException e) {
                     LOG.debug(e.getMessage(), e);
                 } finally {
+                    // TODO This line causes FindBugs (static code analysis 
tool) alert with description
+                    //  
http://findbugs.sourceforge.net/bugDescriptions.html#ML_SYNC_ON_FIELD_TO_GUARD_CHANGING_THAT_FIELD
                     listenerThread = null;
                 }
             }
diff --git 
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/protocol/ResponseMDN.java
 
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/protocol/ResponseMDN.java
index 48c70db..bf546a8 100644
--- 
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/protocol/ResponseMDN.java
+++ 
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/protocol/ResponseMDN.java
@@ -136,9 +136,8 @@ public class ResponseMDN implements HttpResponseInterceptor 
{
         // Return a Message Disposition Notification Receipt in response body
         String boundary = EntityUtils.createBoundaryValue();
         DispositionNotificationMultipartReportEntity multipartReportEntity;
-        if (HttpMessageUtils.getHeaderValue(request, 
AS2Header.DISPOSITION_TYPE) != null
-                || HttpMessageUtils.getHeaderValue(request, 
AS2Header.DISPOSITION_TYPE)
-                   == AS2DispositionType.FAILED.getType()) {
+        if (AS2DispositionType.FAILED.getType()
+                .equals(HttpMessageUtils.getHeaderValue(request, 
AS2Header.DISPOSITION_TYPE))) {
             // Return a failed Message Disposition Notification Receipt in 
response body
             String mdnMessage = 
createMdnDescription(httpEntityEnclosingRequest, response,
                     DispositionMode.AUTOMATIC_ACTION_MDN_SENT_AUTOMATICALLY,