You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/05/23 09:04:57 UTC
[1/3] git commit: CAMEL-7451: Fixed potentail NPE in ftp changed read
lock.
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x 6369450f3 -> 291683f16
refs/heads/camel-2.13.x c4b2c8280 -> b11850e0e
refs/heads/master 57ba1bdea -> 6a696116c
CAMEL-7451: Fixed potentail NPE in ftp changed read lock.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6a696116
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6a696116
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6a696116
Branch: refs/heads/master
Commit: 6a696116c6102b82eccfb81a65ba85a37a3c0d2e
Parents: 57ba1bd
Author: Claus Ibsen <da...@apache.org>
Authored: Fri May 23 09:03:47 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri May 23 09:03:47 2014 +0200
----------------------------------------------------------------------
.../remote/strategy/FtpChangedExclusiveReadLockStrategy.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6a696116/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java
index 5ff78a6..3169f18 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java
@@ -80,8 +80,10 @@ public class FtpChangedExclusiveReadLockStrategy implements GenericFileExclusive
LOG.trace("List files {} found {} files", file.getAbsoluteFilePath(), files.size());
for (FTPFile f : files) {
if (f.getName().equals(file.getFileNameOnly())) {
- newLastModified = f.getTimestamp().getTimeInMillis();
newLength = f.getSize();
+ if (f.getTimestamp() != null) {
+ newLastModified = f.getTimestamp().getTimeInMillis();
+ }
}
}
[2/3] git commit: CAMEL-7451: Fixed potentail NPE in ftp changed read
lock.
Posted by da...@apache.org.
CAMEL-7451: Fixed potentail NPE in ftp changed read lock.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b11850e0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b11850e0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b11850e0
Branch: refs/heads/camel-2.13.x
Commit: b11850e0eb050ac4d35eb1351836a4be604f7210
Parents: c4b2c82
Author: Claus Ibsen <da...@apache.org>
Authored: Fri May 23 09:03:47 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri May 23 09:04:06 2014 +0200
----------------------------------------------------------------------
.../remote/strategy/FtpChangedExclusiveReadLockStrategy.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b11850e0/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java
index 5ff78a6..3169f18 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java
@@ -80,8 +80,10 @@ public class FtpChangedExclusiveReadLockStrategy implements GenericFileExclusive
LOG.trace("List files {} found {} files", file.getAbsoluteFilePath(), files.size());
for (FTPFile f : files) {
if (f.getName().equals(file.getFileNameOnly())) {
- newLastModified = f.getTimestamp().getTimeInMillis();
newLength = f.getSize();
+ if (f.getTimestamp() != null) {
+ newLastModified = f.getTimestamp().getTimeInMillis();
+ }
}
}
[3/3] git commit: CAMEL-7451: Fixed potentail NPE in ftp changed read
lock.
Posted by da...@apache.org.
CAMEL-7451: Fixed potentail NPE in ftp changed read lock.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/291683f1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/291683f1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/291683f1
Branch: refs/heads/camel-2.12.x
Commit: 291683f16caba9eebebfafcbbe039db1241554b3
Parents: 6369450
Author: Claus Ibsen <da...@apache.org>
Authored: Fri May 23 09:03:47 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri May 23 09:04:40 2014 +0200
----------------------------------------------------------------------
.../remote/strategy/FtpChangedExclusiveReadLockStrategy.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/291683f1/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java
index 5ff78a6..3169f18 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java
@@ -80,8 +80,10 @@ public class FtpChangedExclusiveReadLockStrategy implements GenericFileExclusive
LOG.trace("List files {} found {} files", file.getAbsoluteFilePath(), files.size());
for (FTPFile f : files) {
if (f.getName().equals(file.getFileNameOnly())) {
- newLastModified = f.getTimestamp().getTimeInMillis();
newLength = f.getSize();
+ if (f.getTimestamp() != null) {
+ newLastModified = f.getTimestamp().getTimeInMillis();
+ }
}
}