camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject [1/2] git commit: CAMEL-6626 Fixed the search criteria NPE of camel-mail with thanks to Ales
Date Tue, 13 Aug 2013 06:40:49 GMT
Updated Branches:
  refs/heads/camel-2.11.x 76d8bee13 -> 8cc6b57c8
  refs/heads/master 24e01f171 -> 0682e8dd4


CAMEL-6626 Fixed the search criteria NPE of camel-mail with thanks to Ales


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0682e8dd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0682e8dd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0682e8dd

Branch: refs/heads/master
Commit: 0682e8dd41045e3375b61d3d76f6e6991e98c869
Parents: 24e01f1
Author: Willem Jiang <ningjiang@apache.org>
Authored: Tue Aug 13 14:23:10 2013 +0800
Committer: Willem Jiang <ningjiang@apache.org>
Committed: Tue Aug 13 14:23:10 2013 +0800

----------------------------------------------------------------------
 .../java/org/apache/camel/component/mail/MailConverters.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/0682e8dd/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
----------------------------------------------------------------------
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
index 661973f..8262c14 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
@@ -142,7 +142,7 @@ public final class MailConverters {
             }
         }
         if (simple.getToSentDate() != null) {
-            String s = simple.getFromSentDate();
+            String s = simple.getToSentDate();
             if (s.startsWith("now")) {
                 long offset = extractOffset(s, typeConverter);
                 builder = builder.and(new NowSearchTerm(SearchTermBuilder.Comparison.LE.asNum(),
true, offset));
@@ -153,7 +153,7 @@ public final class MailConverters {
             }
         }
         if (simple.getFromReceivedDate() != null) {
-            String s = simple.getFromSentDate();
+            String s = simple.getFromReceivedDate();
             if (s.startsWith("now")) {
                 long offset = extractOffset(s, typeConverter);
                 builder = builder.and(new NowSearchTerm(SearchTermBuilder.Comparison.GE.asNum(),
false, offset));
@@ -164,7 +164,7 @@ public final class MailConverters {
             }
         }
         if (simple.getToReceivedDate() != null) {
-            String s = simple.getFromSentDate();
+            String s = simple.getToReceivedDate();
             if (s.startsWith("now")) {
                 long offset = extractOffset(s, typeConverter);
                 builder = builder.and(new NowSearchTerm(SearchTermBuilder.Comparison.LE.asNum(),
false, offset));


Mime
View raw message