(nifi) branch main updated: NIFI-5894 set a default last modified time when no last modified time is provided instead of NPE

[joewitt]

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

joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
     new 0bd3635ff9 NIFI-5894 set a default last modified time when no last 
modified time is provided instead of NPE
0bd3635ff9 is described below

commit 0bd3635ff9cd3c1c700fe551cb66aa366f1c9186
Author: Eric <x16....@gmail.com>
AuthorDate: Wed Dec 19 14:11:38 2018 -0500

    NIFI-5894 set a default last modified time when no last modified time is 
provided instead of NPE
    
    This closes #3229.
    
    Signed-off-by: Joseph Witt <joew...@apache.org>
---
 .../java/org/apache/nifi/processors/standard/util/FTPTransfer.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
index 057f66c8a5..e9cb364df4 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPTransfer.java
@@ -313,12 +313,14 @@ public class FTPTransfer implements FileTransfer {
         perms.append(file.hasPermission(FTPFile.WORLD_ACCESS, 
FTPFile.WRITE_PERMISSION) ? "w" : "-");
         perms.append(file.hasPermission(FTPFile.WORLD_ACCESS, 
FTPFile.EXECUTE_PERMISSION) ? "x" : "-");
 
+        final long lastModifiedTime  = (file.getTimestamp() != null) ? 
file.getTimestamp().getTimeInMillis() : 0L;
+
         FileInfo.Builder builder = new FileInfo.Builder()
             .filename(file.getName())
             .fullPathFileName(newFullForwardPath)
             .directory(file.isDirectory())
             .size(file.getSize())
-            .lastModifiedTime(file.getTimestamp().getTimeInMillis())
+            .lastModifiedTime(lastModifiedTime)
             .permissions(perms.toString())
             .owner(file.getUser())
             .group(file.getGroup());