cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jburw...@apache.org
Subject git commit: updated refs/heads/master to 6ec9a44
Date Thu, 01 Aug 2013 05:59:08 GMT
Updated Branches:
  refs/heads/master c92cb4f3d -> 6ec9a4442


- CLOUDSTACK-3229: Works around Introspector bug that does not recognize
  Boolean typed accessor methods by manualy populating the https value.
A generic implementation will be investigated when time permits.


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

Branch: refs/heads/master
Commit: 6ec9a444292653399feb01583bf3b70a17c88fb1
Parents: c92cb4f
Author: John Burwell <jburwell@apache.org>
Authored: Thu Aug 1 01:41:24 2013 -0400
Committer: John Burwell <jburwell@apache.org>
Committed: Thu Aug 1 01:54:54 2013 -0400

----------------------------------------------------------------------
 .../com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 6 +++++-
 .../hypervisor/xen/resource/XenServerStorageProcessor.java    | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6ec9a444/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index f0a6964..7663b37 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -7407,9 +7407,13 @@ public abstract class CitrixResourceBase implements ServerResource,
HypervisorRe
 
             final List<String> parameters = newArrayList(flattenProperties(s3,
                     S3Utils.ClientOptions.class));
+            // https workaround for Introspector bug that does not
+            // recognize Boolean accessor methods ...
             parameters.addAll(Arrays.asList("operation", "put", "directory",
                     dir, "filename", filename, "iSCSIFlag",
-                    iSCSIFlag.toString(), "bucket", s3.getBucketName(), "key", key));
+                    iSCSIFlag.toString(), "bucket", s3.getBucketName(),
+                    "key", key, "https", s3.isHttps() != null ? s3.isHttps().toString()
+                    : "null"));
             final String result = callHostPluginAsync(connection, "s3xen",
                     "s3", wait,
                     parameters.toArray(new String[parameters.size()]));

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6ec9a444/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
index 9cd0b33..9190952 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
@@ -68,6 +68,7 @@ import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
 import org.apache.cloudstack.storage.to.SnapshotObjectTO;
 import org.apache.cloudstack.storage.to.TemplateObjectTO;
 import org.apache.cloudstack.storage.to.VolumeObjectTO;
+import org.apache.cloudstack.storage.to.VolumeObjectTO;
 import org.apache.log4j.Logger;
 import org.apache.xmlrpc.XmlRpcException;
 
@@ -1076,9 +1077,13 @@ public class XenServerStorageProcessor implements StorageProcessor
{
 
             final List<String> parameters = newArrayList(flattenProperties(s3,
                     S3Utils.ClientOptions.class));
+            // https workaround for Introspector bug that does not
+            // recognize Boolean accessor methods ...
             parameters.addAll(Arrays.asList("operation", "put", "directory",
                     dir, "filename", filename, "iSCSIFlag",
-                    iSCSIFlag.toString(), "bucket", s3.getBucketName(), "key", key));
+                    iSCSIFlag.toString(), "bucket", s3.getBucketName(),
+                    "key", key, "https", s3.isHttps() != null ? s3.isHttps().toString()
+                    : "null"));
             final String result = hypervisorResource.callHostPluginAsync(connection, "s3xen",
                     "s3", wait,
                     parameters.toArray(new String[parameters.size()]));


Mime
View raw message