[kafka] branch trunk updated: KAFKA-7048 NPE when creating connector (#5202)

[gu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

guozhang pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 6810617  KAFKA-7048 NPE when creating connector (#5202)
6810617 is described below

commit 6810617179222ae659343efb02ef7e6cefb15662
Author: Chia-Ping Tsai <ch...@gmail.com>
AuthorDate: Mon Jun 18 07:49:01 2018 +0800

    KAFKA-7048 NPE when creating connector (#5202)
    
    Reviewers: Robert Yokota <ra...@gmail.com>, Konstantine Karantasis <ko...@confluent.io>, Guozhang Wang <wa...@gmail.com>
---
 .../org/apache/kafka/connect/runtime/WorkerConfigTransformer.java   | 1 +
 .../apache/kafka/connect/runtime/WorkerConfigTransformerTest.java   | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerConfigTransformer.java b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerConfigTransformer.java
index b8465c0..7efb481 100644
--- a/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerConfigTransformer.java
+++ b/connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerConfigTransformer.java
@@ -39,6 +39,7 @@ public class WorkerConfigTransformer {
     }
 
     public Map<String, String> transform(String connectorName, Map<String, String> configs) {
+        if (configs == null) return null;
         ConfigTransformerResult result = configTransformer.transform(configs);
         scheduleReload(connectorName, result.ttls());
         return result.data();
diff --git a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerConfigTransformerTest.java b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerConfigTransformerTest.java
index edd4a6c..300022d 100644
--- a/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerConfigTransformerTest.java
+++ b/connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerConfigTransformerTest.java
@@ -32,6 +32,7 @@ import java.util.Map;
 import java.util.Set;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.powermock.api.easymock.PowerMock.replayAll;
 
 @RunWith(PowerMockRunner.class)
@@ -110,6 +111,11 @@ public class WorkerConfigTransformerTest {
         assertEquals(TEST_RESULT_WITH_LONGER_TTL, result.get(MY_KEY));
     }
 
+    @Test
+    public void testTransformNullConfiguration() {
+        assertNull(configTransformer.transform(MY_CONNECTOR, null));
+    }
+
     public static class TestConfigProvider implements ConfigProvider {
 
         public void configure(Map<String, ?> configs) {

-- 
To stop receiving notification emails like this one, please contact
guozhang@apache.org.