Return-Path: X-Original-To: apmail-flume-commits-archive@www.apache.org Delivered-To: apmail-flume-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E0AAFD502 for ; Thu, 25 Oct 2012 16:42:42 +0000 (UTC) Received: (qmail 39225 invoked by uid 500); 25 Oct 2012 16:42:42 -0000 Delivered-To: apmail-flume-commits-archive@flume.apache.org Received: (qmail 39205 invoked by uid 500); 25 Oct 2012 16:42:42 -0000 Mailing-List: contact commits-help@flume.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flume.apache.org Delivered-To: mailing list commits@flume.apache.org Received: (qmail 39198 invoked by uid 99); 25 Oct 2012 16:42:42 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Oct 2012 16:42:42 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9A11F4F799; Thu, 25 Oct 2012 16:42:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brock@apache.org To: commits@flume.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: FLUME-1662: Convert null body in events into zero length arrays Message-Id: <20121025164242.9A11F4F799@tyr.zones.apache.org> Date: Thu, 25 Oct 2012 16:42:42 +0000 (UTC) Updated Branches: refs/heads/flume-1.3.0 0bb1b21e3 -> af711b3d8 FLUME-1662: Convert null body in events into zero length arrays (Hari Shreedharan via Brock Noland) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/af711b3d Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/af711b3d Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/af711b3d Branch: refs/heads/flume-1.3.0 Commit: af711b3d8e4c0e12656aaaeffb505a1c035eee83 Parents: 0bb1b21 Author: Brock Noland Authored: Thu Oct 25 11:41:00 2012 -0500 Committer: Brock Noland Committed: Thu Oct 25 11:41:27 2012 -0500 ---------------------------------------------------------------------- .../apache/flume/source/http/TestJSONHandler.java | 4 ++-- .../java/org/apache/flume/event/EventBuilder.java | 3 +++ .../java/org/apache/flume/event/JSONEvent.java | 8 ++++++-- .../java/org/apache/flume/event/SimpleEvent.java | 5 ++++- 4 files changed, 15 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/af711b3d/flume-ng-core/src/test/java/org/apache/flume/source/http/TestJSONHandler.java ---------------------------------------------------------------------- diff --git a/flume-ng-core/src/test/java/org/apache/flume/source/http/TestJSONHandler.java b/flume-ng-core/src/test/java/org/apache/flume/source/http/TestJSONHandler.java index e8f256b..455781c 100644 --- a/flume-ng-core/src/test/java/org/apache/flume/source/http/TestJSONHandler.java +++ b/flume-ng-core/src/test/java/org/apache/flume/source/http/TestJSONHandler.java @@ -113,7 +113,7 @@ public class TestJSONHandler { List deserialized = handler.getEvents(req); Event e = deserialized.get(0); Assert.assertEquals("b", e.getHeaders().get("a")); - Assert.assertTrue(e.getBody() == null); + Assert.assertTrue(e.getBody().length == 0); e = deserialized.get(1); Assert.assertEquals("f", e.getHeaders().get("e")); Assert.assertEquals("rand\"om_body2", new String(e.getBody(),"UTF-8")); @@ -127,7 +127,7 @@ public class TestJSONHandler { List deserialized = handler.getEvents(req); Event e = deserialized.get(0); Assert.assertEquals("b", e.getHeaders().get("a")); - Assert.assertTrue(e.getBody() == null); + Assert.assertTrue(e.getBody().length == 0); e = deserialized.get(1); Assert.assertEquals("f", e.getHeaders().get("e")); Assert.assertEquals("random_body2", new String(e.getBody(),"UTF-8")); http://git-wip-us.apache.org/repos/asf/flume/blob/af711b3d/flume-ng-sdk/src/main/java/org/apache/flume/event/EventBuilder.java ---------------------------------------------------------------------- diff --git a/flume-ng-sdk/src/main/java/org/apache/flume/event/EventBuilder.java b/flume-ng-sdk/src/main/java/org/apache/flume/event/EventBuilder.java index 4d96114..a5e01fc 100644 --- a/flume-ng-sdk/src/main/java/org/apache/flume/event/EventBuilder.java +++ b/flume-ng-sdk/src/main/java/org/apache/flume/event/EventBuilder.java @@ -37,6 +37,9 @@ public class EventBuilder { public static Event withBody(byte[] body, Map headers) { Event event = new SimpleEvent(); + if(body == null) { + body = new byte[0]; + } event.setBody(body); if (headers != null) { http://git-wip-us.apache.org/repos/asf/flume/blob/af711b3d/flume-ng-sdk/src/main/java/org/apache/flume/event/JSONEvent.java ---------------------------------------------------------------------- diff --git a/flume-ng-sdk/src/main/java/org/apache/flume/event/JSONEvent.java b/flume-ng-sdk/src/main/java/org/apache/flume/event/JSONEvent.java index e62f689..5c6c0d4 100644 --- a/flume-ng-sdk/src/main/java/org/apache/flume/event/JSONEvent.java +++ b/flume-ng-sdk/src/main/java/org/apache/flume/event/JSONEvent.java @@ -50,14 +50,18 @@ public class JSONEvent implements Event{ return null; } } else { - return null; + return new byte[0]; } } @Override public void setBody(byte[] body) { - this.body = new String(body); + if(body != null) { + this.body = new String(body); + } else { + this.body = ""; + } } public void setCharset(String charset) { http://git-wip-us.apache.org/repos/asf/flume/blob/af711b3d/flume-ng-sdk/src/main/java/org/apache/flume/event/SimpleEvent.java ---------------------------------------------------------------------- diff --git a/flume-ng-sdk/src/main/java/org/apache/flume/event/SimpleEvent.java b/flume-ng-sdk/src/main/java/org/apache/flume/event/SimpleEvent.java index fed7bb6..a7ac36f 100644 --- a/flume-ng-sdk/src/main/java/org/apache/flume/event/SimpleEvent.java +++ b/flume-ng-sdk/src/main/java/org/apache/flume/event/SimpleEvent.java @@ -31,7 +31,7 @@ public class SimpleEvent implements Event { public SimpleEvent() { headers = new HashMap(); - body = null; + body = new byte[0]; } @Override @@ -51,6 +51,9 @@ public class SimpleEvent implements Event { @Override public void setBody(byte[] body) { + if(body == null){ + body = new byte[0]; + } this.body = body; }