cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sw...@apache.org
Subject git commit: updated refs/heads/master to d3af2db
Date Tue, 22 Jul 2014 21:31:01 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 173909e99 -> d3af2dbec


CLOUDSTACK-6886 - Fixed the issue created by the SSL feature with the SDX:


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d3af2dbe
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d3af2dbe
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d3af2dbe

Branch: refs/heads/master
Commit: d3af2dbecacf260acda9f84a51a42838cc0f798c
Parents: 173909e
Author: Will Stevens <wstevens@cloudops.com>
Authored: Tue Jul 22 17:28:01 2014 -0400
Committer: Will Stevens <wstevens@cloudops.com>
Committed: Tue Jul 22 17:28:01 2014 -0400

----------------------------------------------------------------------
 .../src/com/cloud/network/resource/NetscalerResource.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d3af2dbe/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
index 8757699..d556362 100644
--- a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
+++ b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
@@ -247,7 +247,7 @@ public class NetscalerResource implements ServerResource {
 
             //enable load balancing feature
             enableLoadBalancingFeature();
-            SSL.enableSslFeature(_netscalerService);
+            SSL.enableSslFeature(_netscalerService, _isSdx);
 
             //if the the device is cloud stack provisioned then make it part of the public
network
             if (_cloudManaged) {
@@ -1910,7 +1910,10 @@ public class NetscalerResource implements ServerResource {
             }
         }
 
-        private static void enableSslFeature(nitro_service ns) throws ExecutionException
{
+        private static void enableSslFeature(nitro_service ns, boolean isSdx) throws ExecutionException
{
+            if (isSdx) {
+                return;
+            }
             try {
                 base_response result = ns.enable_features(new String[] {"SSL"});
                 if (result.errorcode != 0)


Mime
View raw message