[tomcat] 02/02: Review PR #227. Add changelog entry

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 982629dc7c86c392836b74cee14b14f4a6eae551
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Dec 5 12:53:50 2019 +0000

    Review PR #227. Add changelog entry
---
 java/org/apache/catalina/session/FileStore.java     |  3 +--
 test/org/apache/catalina/session/FileStoreTest.java | 14 +++++++-------
 webapps/docs/changelog.xml                          |  5 +++++
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/session/FileStore.java 
b/java/org/apache/catalina/session/FileStore.java
index 48d464e..73016ff 100644
--- a/java/org/apache/catalina/session/FileStore.java
+++ b/java/org/apache/catalina/session/FileStore.java
@@ -176,11 +176,10 @@ public final class FileStore extends StoreBase {
         if (dir == null) {
             return new String[0];
         }
-
         String files[] = dir.list();
 
         // Bugzilla 32130
-        if((files == null) || (files.length < 1)) {
+        if (files == null || files.length < 1) {
             return new String[0];
         }
 
diff --git a/test/org/apache/catalina/session/FileStoreTest.java 
b/test/org/apache/catalina/session/FileStoreTest.java
index 330c4a0..f2555de 100644
--- a/test/org/apache/catalina/session/FileStoreTest.java
+++ b/test/org/apache/catalina/session/FileStoreTest.java
@@ -19,17 +19,17 @@ package org.apache.catalina.session;
 import java.io.File;
 import java.io.IOException;
 
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
 import org.apache.catalina.Manager;
 import org.apache.tomcat.unittest.TesterContext;
 import org.apache.tomcat.unittest.TesterServletContext;
 import org.apache.tomcat.util.http.fileupload.FileUtils;
-import org.junit.*;
 
-/**
- * Test utility methods of FileStore class
- *
- * @author Govinda Sakhare
- */
 public class FileStoreTest {
 
     private static final String SESS_TEMPPATH = "SESS_TEMP";
@@ -41,7 +41,7 @@ public class FileStoreTest {
 
 
     @BeforeClass
-    public static void setup() throws IOException {
+    public static void setup() {
         TesterContext testerContext = new TesterContext();
         testerContext.setServletContext(new TesterServletContext());
         manager.setContext(testerContext);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 861096f..2b1b3eb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -94,6 +94,11 @@
       <update>
         <bug>63987</bug>: Deprecate <code>Realm.getRoles(Principal)</code>. 
(michaelo)
       </update>
+      <scode>
+        Add a unit test for the session <code>FileStore</code> implementation
+        and refactor loops in <code>FileStore</code> to use the ForEach style.
+        Pull request provided by Govinda Sakhare. (markt)
+      </scode>
     </changelog>
   </subsection>
   <subsection name="Coyote">


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org