You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/10/25 12:10:06 UTC
[camel] branch camel-2.20.x updated: CAMEL-11944: Ensure
HBaseConfiguration ClassLoader is set correctly
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.20.x by this push:
new 2d2dbf0 CAMEL-11944: Ensure HBaseConfiguration ClassLoader is set correctly
2d2dbf0 is described below
commit 2d2dbf03aa49835f25ee1386514cf7e540cd491d
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Oct 25 07:49:13 2017 +0100
CAMEL-11944: Ensure HBaseConfiguration ClassLoader is set correctly
---
.../main/java/org/apache/camel/component/hbase/HBaseComponent.java | 7 +++++--
.../java/org/apache/camel/component/hbase/HBaseComponentTest.java | 6 +++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseComponent.java b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseComponent.java
index d690092..10ada08 100644
--- a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseComponent.java
+++ b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/HBaseComponent.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.hbase;
import java.util.Map;
import java.util.concurrent.Executors;
+import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.impl.UriEndpointComponent;
import org.apache.camel.spi.Metadata;
@@ -44,13 +45,15 @@ public class HBaseComponent extends UriEndpointComponent {
super(HBaseEndpoint.class);
}
+ public HBaseComponent(CamelContext context) {
+ super(context, HBaseEndpoint.class);
+ }
+
@Override
protected void doStart() throws Exception {
if (configuration == null) {
configuration = HBaseConfiguration.create();
- }
- if (configuration.getClassLoader() == null) {
ClassLoader applicationContextClassLoader = getCamelContext().getApplicationContextClassLoader();
if (applicationContextClassLoader != null) {
configuration.setClassLoader(applicationContextClassLoader);
diff --git a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseComponentTest.java b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseComponentTest.java
index 5cfed5e..697bdaf 100644
--- a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseComponentTest.java
+++ b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseComponentTest.java
@@ -34,7 +34,7 @@ public class HBaseComponentTest {
CamelContext camelContext = new DefaultCamelContext();
camelContext.setApplicationContextClassLoader(expectedClassLoader);
- HBaseComponent component = new HBaseComponent();
+ HBaseComponent component = new HBaseComponent(new DefaultCamelContext());
component.doStart();
component.doStop();
@@ -49,7 +49,7 @@ public class HBaseComponentTest {
Configuration configuration = HBaseConfiguration.create();
configuration.setClassLoader(expectedClassLoader);
- HBaseComponent component = new HBaseComponent();
+ HBaseComponent component = new HBaseComponent(new DefaultCamelContext());
component.setConfiguration(configuration);
try {
component.doStart();
@@ -66,7 +66,7 @@ public class HBaseComponentTest {
public void testHBaseConfigurationClassLoaderSetToDefault() throws Exception {
ClassLoader expectedClassLoader = HBaseConfiguration.class.getClassLoader();
- HBaseComponent component = new HBaseComponent();
+ HBaseComponent component = new HBaseComponent(new DefaultCamelContext());
component.doStart();
component.doStop();
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].