Return-Path: X-Original-To: apmail-incubator-flume-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-flume-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E28DF80E5 for ; Mon, 22 Aug 2011 22:04:15 +0000 (UTC) Received: (qmail 51037 invoked by uid 500); 22 Aug 2011 22:04:15 -0000 Delivered-To: apmail-incubator-flume-commits-archive@incubator.apache.org Received: (qmail 51010 invoked by uid 500); 22 Aug 2011 22:04:15 -0000 Mailing-List: contact flume-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: flume-dev@incubator.apache.org Delivered-To: mailing list flume-commits@incubator.apache.org Received: (qmail 51003 invoked by uid 99); 22 Aug 2011 22:04:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Aug 2011 22:04:15 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Aug 2011 22:04:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 61FDC23889DE; Mon, 22 Aug 2011 22:03:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1160464 - in /incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/formatter/output: EventFormatter.java TextDelimitedOutputFormatter.java Date: Mon, 22 Aug 2011 22:03:54 -0000 To: flume-commits@incubator.apache.org From: esammer@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110822220354.61FDC23889DE@eris.apache.org> Author: esammer Date: Mon Aug 22 22:03:53 2011 New Revision: 1160464 URL: http://svn.apache.org/viewvc?rev=1160464&view=rev Log: - Created an EventFormatter interface from TextDelimitedOutputFormatter. Avoid NPE when stringifying an event with a null body. Added: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/formatter/output/EventFormatter.java Modified: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/formatter/output/TextDelimitedOutputFormatter.java Added: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/formatter/output/EventFormatter.java URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/formatter/output/EventFormatter.java?rev=1160464&view=auto ============================================================================== --- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/formatter/output/EventFormatter.java (added) +++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/formatter/output/EventFormatter.java Mon Aug 22 22:03:53 2011 @@ -0,0 +1,9 @@ +package org.apache.flume.formatter.output; + +import org.apache.flume.Event; + +public interface EventFormatter { + + public byte[] format(Event event); + +} Modified: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/formatter/output/TextDelimitedOutputFormatter.java URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/formatter/output/TextDelimitedOutputFormatter.java?rev=1160464&r1=1160463&r2=1160464&view=diff ============================================================================== --- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/formatter/output/TextDelimitedOutputFormatter.java (original) +++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/formatter/output/TextDelimitedOutputFormatter.java Mon Aug 22 22:03:53 2011 @@ -2,10 +2,13 @@ package org.apache.flume.formatter.outpu import org.apache.flume.Event; -public class TextDelimitedOutputFormatter { +public class TextDelimitedOutputFormatter implements EventFormatter { + @Override public byte[] format(Event event) { - return (new String(event.getBody()) + "\n").getBytes(); + String body = event.getBody().length > 0 ? new String(event.getBody()) : ""; + + return (body + "\n").getBytes(); } }