From 0c4cfa3d6b4837e80d6f5d3e50b1bc99c433445d Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Mon, 8 Nov 2010 18:35:31 -0500 Subject: [PATCH] INT-1591 avoiding NPEs when returning file entry names --- .../integration/ftp/FtpPatternMatchingFileListFilter.java | 2 +- .../integration/sftp/SftpPatternMatchingFileListFilter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpPatternMatchingFileListFilter.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpPatternMatchingFileListFilter.java index 62e452635e..4aa8069a23 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpPatternMatchingFileListFilter.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/FtpPatternMatchingFileListFilter.java @@ -39,7 +39,7 @@ public class FtpPatternMatchingFileListFilter extends AbstractPatternMatchingFil @Override protected String getFilename(FTPFile file) { - return file.getName(); + return (file != null) ? file.getName() : null; } } diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpPatternMatchingFileListFilter.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpPatternMatchingFileListFilter.java index fc16642dd8..41eac3a7ff 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpPatternMatchingFileListFilter.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/SftpPatternMatchingFileListFilter.java @@ -40,7 +40,7 @@ public class SftpPatternMatchingFileListFilter extends AbstractPatternMatchingFi @Override protected String getFilename(LsEntry entry) { - return entry.getFilename(); + return (entry != null) ? entry.getFilename() : null; } }