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 2017/07/06 08:29:11 UTC
svn commit: r1800981 - /tomcat/trunk/java/org/apache/juli/FileHandler.java
Author: markt
Date: Thu Jul 6 08:29:11 2017
New Revision: 1800981
URL: http://svn.apache.org/viewvc?rev=1800981&view=rev
Log:
Avoid possible NPE.
Reported by FindBugs.
Modified:
tomcat/trunk/java/org/apache/juli/FileHandler.java
Modified: tomcat/trunk/java/org/apache/juli/FileHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/FileHandler.java?rev=1800981&r1=1800980&r2=1800981&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/FileHandler.java Thu Jul 6 08:29:11 2017
@@ -542,7 +542,11 @@ public class FileHandler extends Handler
}
private String obtainDateFromPath(Path path) {
- String date = path.getFileName().toString();
+ Path fileName = path.getFileName();
+ if (fileName == null) {
+ return null;
+ }
+ String date = fileName.toString();
if (pattern.matcher(date).matches()) {
date = date.substring(prefix.length());
return date.substring(0, date.length() - suffix.length());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org