You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2013/06/24 13:07:23 UTC
[1/2] git commit: updated refs/heads/master to 390022c
Updated Branches:
refs/heads/master 7c46cc958 -> 390022c4e
CLOUDSTACK-3151 [VMware] CloudStack does case sensitive processing of names of VMware objects.
Signed-off-by: Sateesh Chodapuneedi <sa...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3c88dd4f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3c88dd4f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3c88dd4f
Branch: refs/heads/master
Commit: 3c88dd4f801fe255d918fd1de6a962a8ab4fda4d
Parents: 90838d7
Author: Sateesh Chodapuneedi <sa...@apache.org>
Authored: Mon Jun 24 11:06:16 2013 +0530
Committer: Sateesh Chodapuneedi <sa...@apache.org>
Committed: Mon Jun 24 11:06:16 2013 +0530
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/vmware/util/VmwareClient.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3c88dd4f/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
index 87c7909..1b75e2d 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
@@ -24,17 +24,17 @@ import java.util.Map;
import java.util.StringTokenizer;
import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLSession;
import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLSession;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.handler.MessageContext;
-
import com.vmware.vim25.DynamicProperty;
import com.vmware.vim25.InvalidCollectorVersionFaultMsg;
import com.vmware.vim25.InvalidPropertyFaultMsg;
import com.vmware.vim25.LocalizedMethodFault;
import com.vmware.vim25.ManagedObjectReference;
+import com.vmware.vim25.ObjectContent;
import com.vmware.vim25.ObjectSpec;
import com.vmware.vim25.ObjectUpdate;
import com.vmware.vim25.ObjectUpdateKind;
@@ -51,7 +51,6 @@ import com.vmware.vim25.TraversalSpec;
import com.vmware.vim25.UpdateSet;
import com.vmware.vim25.VimPortType;
import com.vmware.vim25.VimService;
-import com.vmware.vim25.ObjectContent;
/**
* A wrapper class to handle Vmware vsphere connection and disconnection.
@@ -554,7 +553,7 @@ public class VmwareClient {
if (type == null || type.equals(mor.getType())) {
if (propary.size() > 0) {
String propval = (String) propary.get(0).getVal();
- if (propval != null && name.equals(propval))
+ if (propval != null && name.equalsIgnoreCase(propval))
return mor;
}
}
[2/2] git commit: updated refs/heads/master to 390022c
Posted by sa...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/390022c4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/390022c4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/390022c4
Branch: refs/heads/master
Commit: 390022c4eaa1d7c6de9e89006f56defc0eb0ebd2
Parents: 3c88dd4 7c46cc9
Author: Sateesh Chodapuneedi <sa...@apache.org>
Authored: Mon Jun 24 11:07:25 2013 +0530
Committer: Sateesh Chodapuneedi <sa...@apache.org>
Committed: Mon Jun 24 11:07:25 2013 +0530
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkServiceImpl.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------