From bbce80911caba996e43aabc3fdd5f400f19ca95f Mon Sep 17 00:00:00 2001
From: Christopher Broderick <uhurusurfa@gmail.com>
Date: Fri, 10 Apr 2026 12:28:26 +0100
Subject: [PATCH] Fix cleanup of files when SSL exception occurs connecting to
 partner.

---
 RELEASE-NOTES.md                                    | 13 ++++++-------
 Server/pom.xml                                      |  2 +-
 .../openas2/processor/sender/AS2SenderModule.java   |  2 ++
 changes.txt                                         |  6 ++++++
 pom.xml                                             |  2 +-
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 7beaf21f..c8a1c61d 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,21 +1,20 @@
 #              OpenAS2 Server
-#              Version 4.8.1
+#              Version 4.8.2
 #              RELEASE NOTES
 -----
-The OpenAS2 project is pleased to announce the release of OpenAS2 4.8.1
+The OpenAS2 project is pleased to announce the release of OpenAS2 4.8.2
 
-The release download file is: OpenAS2Server-4.8.1.zip
+The release download file is: OpenAS2Server-4.8.2.zip
 
 The zip file contains a PDF document (OpenAS2HowTo.pdf) providing information on installing and using the application.
 ## NOTE: Testing covers Java 11 to 21.
 ##       Java 8 is NO LONGER SUPPORTED.
 
-Version 4.8.1 - 2026-03-27
+Version 4.8.2 - 2026-04-10
 =======
 
-This is a minor bugfix release.
-1.  Correct payload filename when using generic directory poller.
-
+This is a bugfix release.
+1.  When an SSL exception occurs connecting to a partner, the file is soptred in the sent directory instead of error directory.
 
 ## Upgrade Notes
  See the openAS2HowTo appendix for the general process on upgrading OpenAS2.
diff --git a/Server/pom.xml b/Server/pom.xml
index d84926ab..86c05f72 100644
--- a/Server/pom.xml
+++ b/Server/pom.xml
@@ -7,7 +7,7 @@
         <!-- DO NOT CHANGE THIS "groupId" WITHOUT CHANGING XMLSession.getManifestAttributes.MANIFEST_VENDOR_ID_ATTRIB -->
         <groupId>net.sf.openas2</groupId>
         <artifactId>OpenAS2</artifactId>
-        <version>4.8.1</version>
+        <version>4.8.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/Server/src/main/java/org/openas2/processor/sender/AS2SenderModule.java b/Server/src/main/java/org/openas2/processor/sender/AS2SenderModule.java
index aaee8ce8..4e0d826b 100644
--- a/Server/src/main/java/org/openas2/processor/sender/AS2SenderModule.java
+++ b/Server/src/main/java/org/openas2/processor/sender/AS2SenderModule.java
@@ -146,6 +146,8 @@ public void handle(String action, Message msg, Map<String, Object> options) thro
             msg.trackMsgState(getSession());
             if ("true".equalsIgnoreCase(msg.getPartnership().getAttributeOrProperty(Partnership.PA_RESEND_ON_SSL_EXCEPTION, "false"))) {
                 resend(msg, new OpenAS2Exception(org.openas2.util.Logging.getExceptionMsg(e)), false);
+            } else {
+               AS2Util.cleanupFiles(msg, true); 
             }
             return;
         } catch (Exception e) {
diff --git a/changes.txt b/changes.txt
index bf46cd68..97bb079f 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,5 +1,11 @@
 **IMPORTANT NOTE**: Please review upgrade notes in the RELEASE-NOTES.md if you are upgrading
 
+Version 4.8.2 - 2026-04-10
+
+This is a bugfix release.
+1.  When an SSL exception occurs connecting to a partner, the file is soptred in the sent directory instead of error directory.
+
+
 Version 4.8.1 - 2026-03-27
 
 This is a minor bugfix release.
diff --git a/pom.xml b/pom.xml
index c4523e0a..64b63972 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sf.openas2</groupId>
     <artifactId>OpenAS2</artifactId>
-    <version>4.8.1</version>
+    <version>4.8.2</version>
     <name>OpenAS2</name>
     <packaging>pom</packaging>