cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amog...@apache.org
Subject git commit: updated refs/heads/master to b693e61
Date Fri, 29 Aug 2014 00:47:31 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master bea73e511 -> b693e61fe


Temp fix for compilation issue, need to check what caused it


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

Branch: refs/heads/master
Commit: b693e61fe665c98177f85aedb0b4b228f269c0b9
Parents: bea73e5
Author: amoghvk <amogh.vasekar@citrix.com>
Authored: Thu Aug 28 17:47:08 2014 -0700
Committer: amoghvk <amogh.vasekar@citrix.com>
Committed: Thu Aug 28 17:47:08 2014 -0700

----------------------------------------------------------------------
 .../src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b693e61f/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java
b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java
index cb34b72..e1caee5 100644
--- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java
+++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java
@@ -1228,15 +1228,15 @@ public class CiscoVnmcConnectionImpl implements CiscoVnmcConnection
{
     }
 
     private String sendRequest(String service, String xmlRequest) throws ExecutionException
{
-        org.apache.commons.httpclient.protocol.Protocol myhttps = new org.apache.commons.httpclient.protocol.Protocol("https",
new EasySSLProtocolSocketFactory(), 443);
+        org.apache.commons.httpclient.protocol.Protocol myhttps = null;
         HttpClient client = new HttpClient();
-        client.getHostConfiguration().setHost(_ip, 443, myhttps);
         byte[] response = null;
         PostMethod method = new PostMethod("/xmlIM/" + service);
-
         method.setRequestBody(xmlRequest);
 
         try {
+            myhttps = new org.apache.commons.httpclient.protocol.Protocol("https", new EasySSLProtocolSocketFactory(),
443);
+            client.getHostConfiguration().setHost(_ip, 443, myhttps);
             int statusCode = client.executeMethod(method);
 
             if (statusCode != HttpStatus.SC_OK) {


Mime
View raw message