[prev in list] [next in list] [prev in thread] [next in thread] 

List:       flume-commits
Subject:    flume git commit: FLUME-2889. Fixes to DateTime computations
From:       roshannaik () apache ! org
Date:       2016-02-26 1:35:18
Message-ID: ccc2faaa712a4095899b0b9c63053a7d () git ! apache ! org
[Download RAW message or body]

Repository: flume
Updated Branches:
  refs/heads/trunk 109ec3072 -> ffb52b9e6


FLUME-2889. Fixes to DateTime computations

(Roshan Naik via Hari Shreedharan)


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

Branch: refs/heads/trunk
Commit: ffb52b9e656df51e5e6881cfc8ed851a89cdc2f1
Parents: 109ec30
Author: Roshan Naik <roshan@hortonworks.com>
Authored: Thu Feb 25 17:31:24 2016 -0800
Committer: Roshan Naik <roshan@hortonworks.com>
Committed: Thu Feb 25 17:31:24 2016 -0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/flume/source/SyslogParser.java      | 4 ++--
 .../apache/flume/serialization/SyslogAvroEventSerializer.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flume/blob/ffb52b9e/flume-ng-core/src/main/java/org/apache/flume/source/SyslogParser.java
                
----------------------------------------------------------------------
diff --git a/flume-ng-core/src/main/java/org/apache/flume/source/SyslogParser.java \
b/flume-ng-core/src/main/java/org/apache/flume/source/SyslogParser.java index \
                b61f745..c8245ff 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/source/SyslogParser.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/source/SyslogParser.java
@@ -325,10 +325,10 @@ public class SyslogParser {
 
       // flume clock is ahead or there is some latency, and the year rolled
       if (fixed.isAfter(now) && fixed.minusMonths(1).isAfter(now)) {
-        fixed = date.withYear(year - 1);
+         fixed = date.minusYears(1);
       // flume clock is behind and the year rolled
       } else if (fixed.isBefore(now) && fixed.plusMonths(1).isBefore(now)) {
-        fixed = date.withYear(year + 1);
+        fixed = date.plusYears(1);
       }
       date = fixed;
     }

http://git-wip-us.apache.org/repos/asf/flume/blob/ffb52b9e/flume-ng-core/src/test/java/org/apache/flume/serialization/SyslogAvroEventSerializer.java
                
----------------------------------------------------------------------
diff --git a/flume-ng-core/src/test/java/org/apache/flume/serialization/SyslogAvroEventSerializer.java \
b/flume-ng-core/src/test/java/org/apache/flume/serialization/SyslogAvroEventSerializer.java
 index d1cbcae..896eced 100644
--- a/flume-ng-core/src/test/java/org/apache/flume/serialization/SyslogAvroEventSerializer.java
                
+++ b/flume-ng-core/src/test/java/org/apache/flume/serialization/SyslogAvroEventSerializer.java
 @@ -190,10 +190,10 @@ public class SyslogAvroEventSerializer
 
       // flume clock is ahead or there is some latency, and the year rolled
       if (corrected.isAfter(now) && corrected.minusMonths(1).isAfter(now)) {
-        corrected = date.withYear(year - 1);
+        corrected = date.minusYears(1);
       // flume clock is behind and the year rolled
       } else if (corrected.isBefore(now) && corrected.plusMonths(1).isBefore(now)) {
-        corrected = date.withYear(year + 1);
+        corrected = date.plusYears(1);
       }
       date = corrected;
     }


[prev in list] [next in list] [prev in thread] [next in thread]