You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/11/26 14:30:23 UTC

svn commit: r1716640 - /tomcat/trunk/java/org/apache/catalina/session/FileStore.java

Author: markt
Date: Thu Nov 26 13:30:23 2015
New Revision: 1716640

URL: http://svn.apache.org/viewvc?rev=1716640&view=rev
Log:
Fix potential NPE reported by FindBugs

Modified:
    tomcat/trunk/java/org/apache/catalina/session/FileStore.java

Modified: tomcat/trunk/java/org/apache/catalina/session/FileStore.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/FileStore.java?rev=1716640&r1=1716639&r2=1716640&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/FileStore.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/FileStore.java Thu Nov 26 13:30:23 2015
@@ -149,12 +149,14 @@ public final class FileStore extends Sto
 
         // Figure out which files are sessions
         int keycount = 0;
-        for (int i = 0; i < files.length; i++) {
-            if (files[i].endsWith(FILE_EXT)) {
-                keycount++;
+        if (files != null) {
+            for (int i = 0; i < files.length; i++) {
+                if (files[i].endsWith(FILE_EXT)) {
+                    keycount++;
+                }
             }
         }
-        return (keycount);
+        return keycount;
 
     }
 



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