You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2017/01/05 21:19:39 UTC
nifi git commit: NIFI-3230 fix ActiveMQ SSL support for simple
connect URIs in Get/Put JMS processors
Repository: nifi
Updated Branches:
refs/heads/master 474df053d -> 3259b01f8
NIFI-3230 fix ActiveMQ SSL support for simple connect URIs in Get/Put JMS processors
This closes #1344.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/3259b01f
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/3259b01f
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/3259b01f
Branch: refs/heads/master
Commit: 3259b01f8ec2c1492c7acf3c9b9b29b8402dda6a
Parents: 474df05
Author: Mike Moser <mo...@apache.org>
Authored: Tue Dec 20 17:26:39 2016 +0000
Committer: Pierre Villard <pi...@gmail.com>
Committed: Thu Jan 5 22:19:25 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/nifi/processors/standard/util/JmsFactory.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/3259b01f/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JmsFactory.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JmsFactory.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JmsFactory.java
index 19e8ac0..a844288 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JmsFactory.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/JmsFactory.java
@@ -382,6 +382,9 @@ public class JmsFactory {
private static boolean isSSL(URI uri) {
try {
CompositeData compositeData = URISupport.parseComposite(uri);
+ if ("ssl".equals(compositeData.getScheme())) {
+ return true;
+ }
for(URI component : compositeData.getComponents()){
if ("ssl".equals(component.getScheme())) {
return true;