Folder close comment reviews

Signed-off-by: Jorge Bescos Gascon <[email protected]>
jbescos · Apr 5, 2024 · 0b0769b · 0b0769b
1 parent 0b21605
commit 0b0769b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 169 deletions.
diff --git a/api/src/main/java/jakarta/mail/Folder.java b/api/src/main/java/jakarta/mail/Folder.java
@@ -103,7 +103,6 @@
 
 public abstract class Folder implements AutoCloseable {
 
-    private final AtomicBoolean closed = new AtomicBoolean(false);
     /**
      * The parent store.
      */
@@ -652,12 +651,14 @@ public abstract boolean delete(boolean recurse)
      */
     @Override
     public void close() throws MessagingException {
-        if (!closed.getAndSet(true)) {
-            try {
-                close(true);
-            } finally {
-                q.terminateQueue();
+        try {
+            close(true);
+        } catch (IllegalStateException ise) {
+            if (isOpen()) {
+                 throw ise;
             }
+        } finally {
+            q.terminateQueue();
         }
     }
 

diff --git a/api/src/test/java/jakarta/mail/FolderTest.java b/api/src/test/java/jakarta/mail/FolderTest.java