Updated Branches: refs/heads/trunk 001d4860e -> f32e8cd4c
FLUME-1847. NPE in SourceConfiguration (Brock Noland 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/f32e8cd4 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/f32e8cd4 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/f32e8cd4 Branch: refs/heads/trunk Commit: f32e8cd4c529b1b334d8adf0282647eac3472294 Parents: 001d486 Author: Hari Shreedharan <harishreedha...@gmail.com> Authored: Fri Jan 25 13:30:13 2013 -0800 Committer: Hari Shreedharan <harishreedha...@gmail.com> Committed: Fri Jan 25 13:31:00 2013 -0800 ---------------------------------------------------------------------- .../flume/conf/source/SourceConfiguration.java | 1 + .../flume/conf/source/TestSourceConfiguration.java | 36 +++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/f32e8cd4/flume-ng-configuration/src/main/java/org/apache/flume/conf/source/SourceConfiguration.java ---------------------------------------------------------------------- diff --git a/flume-ng-configuration/src/main/java/org/apache/flume/conf/source/SourceConfiguration.java b/flume-ng-configuration/src/main/java/org/apache/flume/conf/source/SourceConfiguration.java index 51514e6..3312b04 100644 --- a/flume-ng-configuration/src/main/java/org/apache/flume/conf/source/SourceConfiguration.java +++ b/flume-ng-configuration/src/main/java/org/apache/flume/conf/source/SourceConfiguration.java @@ -40,6 +40,7 @@ public class SourceConfiguration extends ComponentConfiguration { public SourceConfiguration(String componentName) { super(componentName); + channels = new HashSet<String>(); } public Set<String> getChannels() { http://git-wip-us.apache.org/repos/asf/flume/blob/f32e8cd4/flume-ng-configuration/src/test/java/org/apache/flume/conf/source/TestSourceConfiguration.java ---------------------------------------------------------------------- diff --git a/flume-ng-configuration/src/test/java/org/apache/flume/conf/source/TestSourceConfiguration.java b/flume-ng-configuration/src/test/java/org/apache/flume/conf/source/TestSourceConfiguration.java new file mode 100644 index 0000000..1d04158 --- /dev/null +++ b/flume-ng-configuration/src/test/java/org/apache/flume/conf/source/TestSourceConfiguration.java @@ -0,0 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package org.apache.flume.conf.source; + +import org.apache.flume.Context; +import org.apache.flume.conf.ConfigurationException; +import org.junit.Test; + +public class TestSourceConfiguration { + + /** + * Test fails without FLUME-1847 + */ + @Test(expected = ConfigurationException.class) + public void testFLUME1847() throws Exception { + Context context = new Context(); + context.put("type", "something"); + SourceConfiguration sourceConfig = new SourceConfiguration("src"); + sourceConfig.configure(context); + + } +}
