Improved error logging

phax · Feb 10, 2020 · 86eb8c8 · 86eb8c8
1 parent 12d5aab
commit 86eb8c8
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/...rc/main/java/com/helger/phase4/peppol/servlet/Phase4PeppolServletMessageProcessorSPI.java b/...rc/main/java/com/helger/phase4/peppol/servlet/Phase4PeppolServletMessageProcessorSPI.java
@@ -470,7 +470,6 @@ public AS4MessageProcessorResult processAS4UserMessage (@Nonnull final IAS4Incom
                                                                        aPeppolSBD.getReceiverAsIdentifier (),
                                                                        aPeppolSBD.getDocumentTypeAsIdentifier (),
                                                                        aPeppolSBD.getProcessAsIdentifier ());
-
           if (aReceiverEndpoint == null)
           {
             return AS4MessageProcessorResult.createFailure (sLogPrefix +
@@ -482,19 +481,19 @@ public AS4MessageProcessorResult processAS4UserMessage (@Nonnull final IAS4Incom
                                                             aPeppolSBD.getProcessAsIdentifier ().getURIEncoded () +
                                                             ")/transport profile (" +
                                                             m_aTransportProfile.getID () +
-                                                            ")  - not handling incoming AS4 document");
+                                                            ") - not handling incoming AS4 document");
           }
 
-          // Check if the message is for us
-          _checkIfReceiverEndpointURLMatches (sMessageID, aReceiverEndpoint);
-
           // Get the recipient certificate from the SMP
-          _checkIfEndpointCertificateMatches (sMessageID, aReceiverEndpoint);
+          _checkIfEndpointCertificateMatches (sLogPrefix, aReceiverEndpoint);
+
+          // Check if the message is for us
+          _checkIfReceiverEndpointURLMatches (sLogPrefix, aReceiverEndpoint);
         }
         catch (final Phase4Exception ex)
         {
           return AS4MessageProcessorResult.createFailure (sLogPrefix +
-                                                          "The contained StandardBusinessDocument could not be read. Technical details: " +
+                                                          "The addressing data contained in the SBD could not be verified. Technical details: " +
                                                           ex.getMessage ());
         }
       }