You are viewing a plain text version of this content. The canonical link for it is here.

Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2016/12/14 15:38:19 UTC

svn commit: r1774272 - /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Utils.java

Author: mduerig
Date: Wed Dec 14 15:38:19 2016
New Revision: 1774272

URL: http://svn.apache.org/viewvc?rev=1774272&view=rev
Log:
OAK-5293: Static code analysis and code cleanup
Fix possible null dereference

Modified:
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Utils.java

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Utils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Utils.java?rev=1774272&r1=1774271&r2=1774272&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Utils.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/Utils.java Wed Dec 14 15:38:19 2016
@@ -86,7 +86,12 @@ final class Utils {
             return false;
         }
 
-        for (String f : store.list()) {
+        String[] fileNames = store.list();
+        if (fileNames == null) {
+            return false;
+        }
+
+        for (String f : fileNames) {
             if ("journal.log".equals(f)) {
                 return true;
             }