From 5bd65daa03efa2fca9bea0c994530f5680d8d30e Mon Sep 17 00:00:00 2001
From: Alex Huang <alex.huang@gmail.com>
Date: Tue, 25 Jun 2013 13:30:48 -0700
Subject: [PATCH] How did these things actually pass in master

---
 client/pom.xml                                |  2 +-
 .../tomcatconf/nonossComponentContext.xml.in  |  4 ++--
 .../src/com/cloud/storage/UploadVO.java       | 24 +++++++++----------
 .../hypervisor/vmware/VmwareDatacenterVO.java | 14 +++++------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index 8d61900dde8..24f51fbee2f 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -609,7 +609,7 @@
           <version>${project.version}</version>
         </dependency>
       </dependencies>
-    </profile>  
+    </profile>
     <profile>
       <id>netapp</id>
       <activation>
diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in
index c2fe1bbfbb2..d4cc06d7a24 100644
--- a/client/tomcatconf/nonossComponentContext.xml.in
+++ b/client/tomcatconf/nonossComponentContext.xml.in
@@ -104,12 +104,12 @@
 
   <!--
     Netapp support components
-
+-->
   <bean id="lunDaoImpl" class="com.cloud.netapp.dao.LunDaoImpl" />
   <bean id="poolDaoImpl" class="com.cloud.netapp.dao.PoolDaoImpl" />
   <bean id="netappVolumeDaoImpl" class="com.cloud.netapp.dao.VolumeDaoImpl" />
   <bean id="NetappManager" class="com.cloud.netapp.NetappManagerImpl"/>
-  -->  
+  
   <!--
    JuniperSRX support components
   -->
diff --git a/engine/schema/src/com/cloud/storage/UploadVO.java b/engine/schema/src/com/cloud/storage/UploadVO.java
index 63fadfac3e8..f58cd2ba690 100755
--- a/engine/schema/src/com/cloud/storage/UploadVO.java
+++ b/engine/schema/src/com/cloud/storage/UploadVO.java
@@ -44,7 +44,7 @@ public class UploadVO implements Upload {
     private String uuid;
 
     @Column(name = "host_id")
-    private long storeId;
+    private long dataStoreId;
 
     @Column(name = "type_id")
     private long typeId;
@@ -85,11 +85,11 @@ public class UploadVO implements Upload {
 
     @Override
     public long getDataStoreId() {
-        return storeId;
+        return dataStoreId;
     }
 
     public void setDataStoreId(long hostId) {
-        this.storeId = hostId;
+        dataStoreId = hostId;
     }
 
     @Override
@@ -118,35 +118,35 @@ public class UploadVO implements Upload {
 
     public UploadVO(long hostId, long templateId) {
         super();
-        this.storeId = hostId;
-        this.typeId = templateId;
-        this.uuid = UUID.randomUUID().toString();
+        dataStoreId = hostId;
+        typeId = templateId;
+        uuid = UUID.randomUUID().toString();
     }
 
     public UploadVO(long hostId, long typeId, Date lastUpdated, Status uploadState, Type type, String uploadUrl,
             Mode mode) {
         super();
-        this.storeId = hostId;
+        dataStoreId = hostId;
         this.typeId = typeId;
         this.lastUpdated = lastUpdated;
         this.uploadState = uploadState;
         this.mode = mode;
         this.type = type;
         this.uploadUrl = uploadUrl;
-        this.uuid = UUID.randomUUID().toString();
+        uuid = UUID.randomUUID().toString();
     }
 
     public UploadVO(long hostId, long typeId, Date lastUpdated, Status uploadState, int uploadPercent, Type type,
             Mode mode) {
         super();
-        this.storeId = hostId;
+        dataStoreId = hostId;
         this.typeId = typeId;
         this.lastUpdated = lastUpdated;
         this.uploadState = uploadState;
         this.uploadPercent = uploadPercent;
         this.type = type;
         this.mode = mode;
-        this.uuid = UUID.randomUUID().toString();
+        uuid = UUID.randomUUID().toString();
 
     }
 
@@ -154,7 +154,7 @@ public class UploadVO implements Upload {
     }
 
     public UploadVO(Long uploadId) {
-        this.id = uploadId;
+        id = uploadId;
     }
 
     public void setErrorString(String errorString) {
@@ -179,7 +179,7 @@ public class UploadVO implements Upload {
     public boolean equals(Object obj) {
         if (obj instanceof UploadVO) {
             UploadVO other = (UploadVO) obj;
-            return (this.typeId == other.getTypeId() && this.storeId == other.getDataStoreId() && this.type == other
+            return (typeId == other.getTypeId() && dataStoreId == other.getDataStoreId() && type == other
                     .getType());
         }
         return false;
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java
index a13e59e5cb4..5fca8eaeafd 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java
@@ -46,7 +46,7 @@ public class VmwareDatacenterVO implements VmwareDatacenter {
     private String guid;
 
     @Column(name = "name")
-    private String name;
+    private String vmwareDatacenterName;
 
     @Column(name = "vcenter_host")
     private String vCenterHost;
@@ -73,7 +73,7 @@ public class VmwareDatacenterVO implements VmwareDatacenter {
 
     @Override
     public String getVmwareDatacenterName() {
-        return name;
+        return vmwareDatacenterName;
     }
 
     @Override
@@ -105,7 +105,7 @@ public class VmwareDatacenterVO implements VmwareDatacenter {
     }
 
     public void setVmwareDatacenterName(String name) {
-        this.name = name;
+        vmwareDatacenterName = name;
     }
 
     public void setVcenterHost(String vCenterHost) {
@@ -133,15 +133,15 @@ public class VmwareDatacenterVO implements VmwareDatacenter {
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof VmwareDatacenterVO) {
-            return ((VmwareDatacenterVO)obj).getId() == this.getId();
+            return ((VmwareDatacenterVO)obj).getId() == getId();
         } else {
             return false;
         }
     }
 
     public VmwareDatacenterVO(String guid, String name, String vCenterHost, String user, String password) {
-        this.uuid = UUID.randomUUID().toString();
-        this.name = name;
+        uuid = UUID.randomUUID().toString();
+        vmwareDatacenterName = name;
         this.guid = guid;
         this.vCenterHost = vCenterHost;
         this.user = user;
@@ -154,7 +154,7 @@ public class VmwareDatacenterVO implements VmwareDatacenter {
     }
 
     public VmwareDatacenterVO() {
-        this.uuid = UUID.randomUUID().toString();
+        uuid = UUID.randomUUID().toString();
     }
 
 }