Cherry pick branch 'genexuslabs:avoid-nullptr-close-smtp' into beta

tomas-sexenian · Beta Bot · commit 7fff2e27af3e · 2025-03-26T18:17:52.000Z
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`import jakarta.mail.internet.MimeBodyPart;`
`15`	`15`	`import jakarta.activation.*;`
	`16`	`+import org.apache.commons.lang3.ObjectUtils;`
`16`	`17`
`17`	`18`	`public final class SMTPSessionJavaMail implements GXInternetConstants,ISMTPSession`
`18`	`19`	`{`
`@@ -239,6 +240,11 @@ public void logout(GXSMTPSession sessionInfo)`
`239`	`240`	`log ("7 - IOException " + e.getMessage());`
`240`	`241`	`sessionInfo.exceptionHandler(new GXMailException(e.getMessage(), MAIL_ConnectionLost));`
`241`	`242`	`}`
	`243`	`+ catch (NullPointerException e)`
	`244`	`+ {`
	`245`	`+ log ("8 - NullPointerException " + e.getMessage());`
	`246`	`+ sessionInfo.exceptionHandler(new GXMailException(e.getMessage(), MAIL_ConnectionLost));`
	`247`	`+ }`
`242`	`248`	`}`
`243`	`249`
`244`	`250`	`public void setSubject(String subject)`