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

tomas-sexenian · Beta Bot · commit 6ca462f1844e · 2025-03-26T19:09:38.000Z
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -232,18 +232,14 @@ public void logout(GXSMTPSession sessionInfo)`
`232`	`232`	`{`
`233`	`233`	`try`
`234`	`234`	`{`
`235`		`- t.close();`
	`235`	`+ if (t != null)`
	`236`	`+ t.close();`
`236`	`237`	`}`
`237`	`238`	`catch (MessagingException e)`
`238`	`239`	`{`
`239`	`240`	`log ("7 - IOException " + e.getMessage());`
`240`	`241`	`sessionInfo.exceptionHandler(new GXMailException(e.getMessage(), MAIL_ConnectionLost));`
`241`	`242`	`}`
`242`		`- catch (NullPointerException e)`
`243`		`- {`
`244`		`- log ("8 - NullPointerException " + e.getMessage());`
`245`		`- sessionInfo.exceptionHandler(new GXMailException(e.getMessage(), MAIL_ConnectionLost));`
`246`		`- }`
`247`	`243`	`}`
`248`	`244`
`249`	`245`	`public void setSubject(String subject)`