Skip to content

Commit 5bd65da

Browse files
xueyuanxueyuan
committed
How did these things actually pass in master
1 parent e622965 commit 5bd65da

4 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎client/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@
609609
<version>${project.version}</version>
610610
</dependency>
611611
</dependencies>
612-
</profile>
612+
</profile>
613613
<profile>
614614
<id>netapp</id>
615615
<activation>

‎client/tomcatconf/nonossComponentContext.xml.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,12 @@
104104

105105
<!--
106106
Netapp support components
107-
107+
-->
108108
<bean id="lunDaoImpl" class="com.cloud.netapp.dao.LunDaoImpl" />
109109
<bean id="poolDaoImpl" class="com.cloud.netapp.dao.PoolDaoImpl" />
110110
<bean id="netappVolumeDaoImpl" class="com.cloud.netapp.dao.VolumeDaoImpl" />
111111
<bean id="NetappManager" class="com.cloud.netapp.NetappManagerImpl"/>
112-
-->
112+
113113
<!--
114114
JuniperSRX support components
115115
-->

‎engine/schema/src/com/cloud/storage/UploadVO.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class UploadVO implements Upload {
4444
private String uuid;
4545

4646
@Column(name = "host_id")
47-
private long storeId;
47+
private long dataStoreId;
4848

4949
@Column(name = "type_id")
5050
private long typeId;
@@ -85,11 +85,11 @@ public class UploadVO implements Upload {
8585

8686
@Override
8787
public long getDataStoreId() {
88-
return storeId;
88+
return dataStoreId;
8989
}
9090

9191
public void setDataStoreId(long hostId) {
92-
this.storeId = hostId;
92+
dataStoreId = hostId;
9393
}
9494

9595
@Override
@@ -118,43 +118,43 @@ public void setLastUpdated(Date date) {
118118

119119
public UploadVO(long hostId, long templateId) {
120120
super();
121-
this.storeId = hostId;
122-
this.typeId = templateId;
123-
this.uuid = UUID.randomUUID().toString();
121+
dataStoreId = hostId;
122+
typeId = templateId;
123+
uuid = UUID.randomUUID().toString();
124124
}
125125

126126
public UploadVO(long hostId, long typeId, Date lastUpdated, Status uploadState, Type type, String uploadUrl,
127127
Mode mode) {
128128
super();
129-
this.storeId = hostId;
129+
dataStoreId = hostId;
130130
this.typeId = typeId;
131131
this.lastUpdated = lastUpdated;
132132
this.uploadState = uploadState;
133133
this.mode = mode;
134134
this.type = type;
135135
this.uploadUrl = uploadUrl;
136-
this.uuid = UUID.randomUUID().toString();
136+
uuid = UUID.randomUUID().toString();
137137
}
138138

139139
public UploadVO(long hostId, long typeId, Date lastUpdated, Status uploadState, int uploadPercent, Type type,
140140
Mode mode) {
141141
super();
142-
this.storeId = hostId;
142+
dataStoreId = hostId;
143143
this.typeId = typeId;
144144
this.lastUpdated = lastUpdated;
145145
this.uploadState = uploadState;
146146
this.uploadPercent = uploadPercent;
147147
this.type = type;
148148
this.mode = mode;
149-
this.uuid = UUID.randomUUID().toString();
149+
uuid = UUID.randomUUID().toString();
150150

151151
}
152152

153153
protected UploadVO() {
154154
}
155155

156156
public UploadVO(Long uploadId) {
157-
this.id = uploadId;
157+
id = uploadId;
158158
}
159159

160160
public void setErrorString(String errorString) {
@@ -179,7 +179,7 @@ public String getJobId() {
179179
public boolean equals(Object obj) {
180180
if (obj instanceof UploadVO) {
181181
UploadVO other = (UploadVO) obj;
182-
return (this.typeId == other.getTypeId() && this.storeId == other.getDataStoreId() && this.type == other
182+
return (typeId == other.getTypeId() && dataStoreId == other.getDataStoreId() && type == other
183183
.getType());
184184
}
185185
return false;

‎plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class VmwareDatacenterVO implements VmwareDatacenter {
4646
private String guid;
4747

4848
@Column(name = "name")
49-
private String name;
49+
private String vmwareDatacenterName;
5050

5151
@Column(name = "vcenter_host")
5252
private String vCenterHost;
@@ -73,7 +73,7 @@ public long getId() {
7373

7474
@Override
7575
public String getVmwareDatacenterName() {
76-
return name;
76+
return vmwareDatacenterName;
7777
}
7878

7979
@Override
@@ -105,7 +105,7 @@ public void setGuid(String guid) {
105105
}
106106

107107
public void setVmwareDatacenterName(String name) {
108-
this.name = name;
108+
vmwareDatacenterName = name;
109109
}
110110

111111
public void setVcenterHost(String vCenterHost) {
@@ -133,15 +133,15 @@ public int hashCode() {
133133
@Override
134134
public boolean equals(Object obj) {
135135
if (obj instanceof VmwareDatacenterVO) {
136-
return ((VmwareDatacenterVO)obj).getId() == this.getId();
136+
return ((VmwareDatacenterVO)obj).getId() == getId();
137137
} else {
138138
return false;
139139
}
140140
}
141141

142142
public VmwareDatacenterVO(String guid, String name, String vCenterHost, String user, String password) {
143-
this.uuid = UUID.randomUUID().toString();
144-
this.name = name;
143+
uuid = UUID.randomUUID().toString();
144+
vmwareDatacenterName = name;
145145
this.guid = guid;
146146
this.vCenterHost = vCenterHost;
147147
this.user = user;
@@ -154,7 +154,7 @@ public VmwareDatacenterVO(long id, String guid, String name, String vCenterHost,
154154
}
155155

156156
public VmwareDatacenterVO() {
157-
this.uuid = UUID.randomUUID().toString();
157+
uuid = UUID.randomUUID().toString();
158158
}
159159

160160
}

0 commit comments

Comments
 (0)