Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-10100: Fix NPE in AbstractMailReceiver.obtainFolderInstance()

Browse Source 
Fixes: #10083
Issue link: https://github.com/spring-projects/spring-integration/issues/10100

if `url` is not provided, use `store.getDefaultFolder()` instead.

Signed-off-by: Jiandong Ma <jiandong.ma.cn@gmail.com>

(cherry picked from commit cbb0c6fa04)
This commit is contained in:
Jiandong
2025-06-12 22:44:54 +08:00
committed by Spring Builds
parent 62474e63d2
commit ac20fce673
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-integration-mail/src/main/java/org/springframework/integration/mail/AbstractMailReceiver.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -69,6 +69,7 @@ import org.springframework.util.ObjectUtils;
* @author Yuxin Wang
* @author Ngoc Nhan
* @author Filip Hrisafov
* @author Jiandong Ma
*/
public abstract class AbstractMailReceiver extends IntegrationObjectSupport implements MailReceiver, DisposableBean {
@@ -370,6 +371,9 @@ public abstract class AbstractMailReceiver extends IntegrationObjectSupport impl
}
private Folder obtainFolderInstance() throws MessagingException {
if (this.url == null) {
return this.store.getDefaultFolder();
}
return this.store.getFolder(this.url);
}

5
spring-integration-mail/src/test/java/org/springframework/integration/mail/MailReceiverTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2022 the original author or authors.
* Copyright 2014-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ import jakarta.mail.Folder;
import jakarta.mail.Message;
import jakarta.mail.Session;
import jakarta.mail.Store;
import jakarta.mail.URLName;
import org.junit.jupiter.api.Test;
import org.springframework.beans.DirectFieldAccessor;
@@ -68,7 +67,7 @@ public class MailReceiverTests {
Folder folder = mock(Folder.class);
when(folder.exists()).thenReturn(true);
when(folder.isOpen()).thenReturn(false, true);
doReturn(folder).when(store).getFolder((URLName) null);
doReturn(folder).when(store).getDefaultFolder();
doNothing().when(store).connect();
receiver.openFolder();
receiver.openFolder();