From b4a16d586e9bd70ded44c43343f877d085a1a69c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Sexenian?=
 <99925035+tomas-sexenian@users.noreply.github.com>
Date: Wed, 26 Mar 2025 15:16:45 -0300
Subject: [PATCH 1/3] Avoid null pointer exception crashing the webapp.
 Issue:203914

---
 .../main/java/com/genexus/internet/SMTPSessionJavaMail.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java b/gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java
index 1dd2bda20..68f9bd26e 100644
--- a/gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java
+++ b/gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java
@@ -13,6 +13,7 @@
 
 import jakarta.mail.internet.MimeBodyPart;
 import jakarta.activation.*;
+import org.apache.commons.lang3.ObjectUtils;
 
 public final class SMTPSessionJavaMail implements GXInternetConstants,ISMTPSession
 {
@@ -239,6 +240,11 @@ public void logout(GXSMTPSession sessionInfo)
 			log ("7 - IOException " + e.getMessage());
 			sessionInfo.exceptionHandler(new GXMailException(e.getMessage(), MAIL_ConnectionLost));
 		}
+		catch (NullPointerException e)
+		{
+			log ("8 - NullPointerException " + e.getMessage());
+			sessionInfo.exceptionHandler(new GXMailException(e.getMessage(), MAIL_ConnectionLost));
+		}
 	}
 
 	public void setSubject(String subject)

From c6f5c2f3e781ff2cbf2c3dba9dd0747ff077c05d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Sexenian?=
 <99925035+tomas-sexenian@users.noreply.github.com>
Date: Wed, 26 Mar 2025 15:20:47 -0300
Subject: [PATCH 2/3] Remove unused import

---
 .../src/main/java/com/genexus/internet/SMTPSessionJavaMail.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java b/gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java
index 68f9bd26e..d20da5d0e 100644
--- a/gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java
+++ b/gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java
@@ -13,7 +13,6 @@
 
 import jakarta.mail.internet.MimeBodyPart;
 import jakarta.activation.*;
-import org.apache.commons.lang3.ObjectUtils;
 
 public final class SMTPSessionJavaMail implements GXInternetConstants,ISMTPSession
 {

From 94f21a1655810bd6aea5cb545a716143670e9dd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Sexenian?=
 <99925035+tomas-sexenian@users.noreply.github.com>
Date: Wed, 26 Mar 2025 16:08:56 -0300
Subject: [PATCH 3/3] Don't close transport when it's null

---
 .../java/com/genexus/internet/SMTPSessionJavaMail.java    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java b/gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java
index d20da5d0e..4e06763b8 100644
--- a/gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java
+++ b/gxmail/src/main/java/com/genexus/internet/SMTPSessionJavaMail.java
@@ -232,18 +232,14 @@ public void logout(GXSMTPSession sessionInfo)
 	{
 		try
 		{
-			t.close();
+			if (t != null)
+				t.close();
 		}
 		catch (MessagingException e)
 		{
 			log ("7 - IOException " + e.getMessage());
 			sessionInfo.exceptionHandler(new GXMailException(e.getMessage(), MAIL_ConnectionLost));
 		}
-		catch (NullPointerException e)
-		{
-			log ("8 - NullPointerException " + e.getMessage());
-			sessionInfo.exceptionHandler(new GXMailException(e.getMessage(), MAIL_ConnectionLost));
-		}
 	}
 
 	public void setSubject(String subject)