[camel] branch master updated: CAMEL-15496: Fixed NPE

[da...@apache.org]

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

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new d376711  CAMEL-15496: Fixed NPE
d376711 is described below

commit d376711c170500364025064799d8fcf6907c2fde
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Oct 7 07:32:40 2020 +0200

    CAMEL-15496: Fixed NPE
---
 .../component/rabbitmq/RabbitMQComponent.java      |  4 +-
 .../component/rabbitmq/SimpleDataHolderBean.java   | 43 ----------------------
 2 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQComponent.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQComponent.java
index 7a1fca3..4f6f97f 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQComponent.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQComponent.java
@@ -207,9 +207,9 @@ public class RabbitMQComponent extends DefaultComponent {
         TrustManager trustManager
                 = resolveAndRemoveReferenceParameter(params, "trustManager", TrustManager.class, getTrustManager());
         Map<String, Object> additionalHeaders
-                = resolveAndRemoveReferenceParameter(params, "additionalHeaders", SimpleDataHolderBean.class).getMapData();
+                = resolveAndRemoveReferenceParameter(params, "additionalHeaders", Map.class);
         Map<String, Object> additionalProperties
-                = resolveAndRemoveReferenceParameter(params, "additionalProperties", SimpleDataHolderBean.class).getMapData();
+                = resolveAndRemoveReferenceParameter(params, "additionalProperties", Map.class);
         if (LOG.isDebugEnabled()) {
             LOG.debug("Additional headers: {}", additionalHeaders);
             LOG.debug("Additional properties: {}", additionalProperties);
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/SimpleDataHolderBean.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/SimpleDataHolderBean.java
deleted file mode 100644
index 3c56c13..0000000
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/SimpleDataHolderBean.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.camel.component.rabbitmq;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class SimpleDataHolderBean {
-    private Map<String, Object> mapData;
-
-    public SimpleDataHolderBean() {
-        this.mapData = new HashMap<>();
-    }
-
-    public Map<String, Object> getMapData() {
-        return mapData;
-    }
-
-    public void setMapData(Map<String, Object> mapData) {
-        this.mapData = mapData;
-    }
-
-    @Override
-    public String toString() {
-        return "SimpleDataHolderBean{" +
-               "mapData=" + mapData +
-               '}';
-    }
-}