[openmeetings] branch master updated: [OPENMEETINGS-1856] test for clean-up report is added

[solomax]

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

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 802fde5  [OPENMEETINGS-1856] test for clean-up report is added
802fde5 is described below

commit 802fde5c920f73ed2ca2d1053c242523c35a6a44
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Tue Oct 30 22:58:25 2018 +0700

    [OPENMEETINGS-1856] test for clean-up report is added
---
 .../java/org/apache/openmeetings/util/OmFileHelper.java     | 13 ++++++++-----
 .../test/java/org/apache/openmeetings/cli/TestAdmin.java    |  9 +++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git 
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
 
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
index 4a99152..74d0acf 100644
--- 
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
+++ 
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
@@ -347,11 +347,14 @@ public class OmFileHelper {
                if (dir.isFile()) {
                        size = dir.length();
                } else {
-                       for (File file : dir.listFiles()) {
-                               if (file.isFile()) {
-                                       size += file.length();
-                               } else {
-                                       size += getSize(file);
+                       File[] files = dir.listFiles();
+                       if (files != null) {
+                               for (File file : dir.listFiles()) {
+                                       if (file.isFile()) {
+                                               size += file.length();
+                                       } else {
+                                               size += getSize(file);
+                                       }
                                }
                        }
                }
diff --git 
a/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java 
b/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
index 4f1ed3b..d854cf7 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
@@ -123,4 +123,13 @@ public class TestAdmin {
                //backup to file
                a.process("-b", Files.createTempFile("omtempbackup", 
null).toFile().getCanonicalPath());
        }
+
+
+       @Test
+       public void testFiles() throws Exception {
+               Admin a = getAdmin(null);
+               performInstall(a);
+               //clean-up report
+               a.process("-f");
+       }
 }