NIFI-5073: Removed unneeded code for changing ClassLoader since it is now managed by framework
This closes #2653. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/1597492f Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/1597492f Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/1597492f Branch: refs/heads/master Commit: 1597492fed749c13a97f44d0d8ed633787702d3c Parents: db25962 Author: Mark Payne <[email protected]> Authored: Thu May 24 11:29:28 2018 -0400 Committer: Mark Payne <[email protected]> Committed: Thu May 24 11:30:39 2018 -0400 ---------------------------------------------------------------------- .../nifi/jms/cf/JMSConnectionFactoryProvider.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/1597492f/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProvider.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProvider.java b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProvider.java index c61305c..ecb4e7a 100644 --- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProvider.java +++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProvider.java @@ -22,13 +22,9 @@ import java.util.Collections; import java.util.List; import java.util.Map.Entry; -import javax.net.ssl.SSLContext; - import javax.jms.ConnectionFactory; +import javax.net.ssl.SSLContext; -import org.apache.nifi.components.ValidationContext; -import org.apache.nifi.components.ValidationResult; -import org.apache.nifi.components.Validator; import org.apache.nifi.annotation.behavior.DynamicProperty; import org.apache.nifi.annotation.documentation.CapabilityDescription; import org.apache.nifi.annotation.documentation.SeeAlso; @@ -36,6 +32,9 @@ import org.apache.nifi.annotation.documentation.Tags; import org.apache.nifi.annotation.lifecycle.OnDisabled; import org.apache.nifi.annotation.lifecycle.OnEnabled; import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.components.ValidationContext; +import org.apache.nifi.components.ValidationResult; +import org.apache.nifi.components.Validator; import org.apache.nifi.controller.AbstractControllerService; import org.apache.nifi.controller.ConfigurationContext; import org.apache.nifi.expression.ExpressionLanguageScope; @@ -43,7 +42,6 @@ import org.apache.nifi.processor.util.StandardValidators; import org.apache.nifi.reporting.InitializationException; import org.apache.nifi.ssl.SSLContextService; import org.apache.nifi.ssl.SSLContextService.ClientAuth; -import org.apache.nifi.util.file.classloader.ClassLoaderUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -163,11 +161,6 @@ public class JMSConnectionFactoryProvider extends AbstractControllerService impl + context.getProperty(BROKER_URI).evaluateAttributeExpressions().getValue() + "'"); } - // will load user provided libraries/resources on the classpath - final String clientLibPath = context.getProperty(CLIENT_LIB_DIR_PATH).evaluateAttributeExpressions().getValue(); - ClassLoader customClassLoader = ClassLoaderUtils.getCustomClassLoader(clientLibPath, this.getClass().getClassLoader(), null); - Thread.currentThread().setContextClassLoader(customClassLoader); - this.createConnectionFactoryInstance(context); this.setConnectionFactoryProperties(context); }
