You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mo...@apache.org on 2017/05/11 17:33:13 UTC

[11/39] nifi git commit: NIFI-3230 fix ActiveMQ SSL support for simple connect URIs in Get/Put JMS processors

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/954201a4
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/954201a4
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/954201a4

Branch: refs/heads/support/nifi-0.7.x
Commit: 954201a4d74b33964dd361732255d086032901ad
Parents: 0952685
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:20:18 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/954201a4/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 45758a4..26d0399 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
@@ -378,6 +378,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;