flume-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hshreedha...@apache.org
Subject git commit: FLUME-1847. NPE in SourceConfiguration
Date Fri, 25 Jan 2013 21:31:22 GMT
Updated Branches:
  refs/heads/flume-1.4 05e8ebc35 -> a4c86933d


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/a4c86933
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/a4c86933
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/a4c86933

Branch: refs/heads/flume-1.4
Commit: a4c86933d5c148c5327c8f5d5a1912cc24a9c341
Parents: 05e8ebc
Author: Hari Shreedharan <harishreedharan@gmail.com>
Authored: Fri Jan 25 13:30:13 2013 -0800
Committer: Hari Shreedharan <harishreedharan@gmail.com>
Committed: Fri Jan 25 13:30:13 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/a4c86933/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/a4c86933/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);
+
+  }
+}


Mime
View raw message