etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

some String instantiations removed 

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
This commit is contained in:
Laszlo Hornyak 2014-03-30 10:02:46 +02:00
parent 6a9d6f8796
commit 6617187193
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
View File

@ -999,7 +999,7 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface {
if (null != fst) {
String[] timeFilters = new String[1];
timeFilters[0] = new String("start-time");
timeFilters[0] = "start-time";
request = toSnapshotFilterSet(request, fst, timeFilters);
}
@ -1035,8 +1035,8 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface {
if (null != fst) {
String[] timeFilters = new String[2];
timeFilters[0] = new String("attachment.attach-time");
timeFilters[1] = new String("create-time");
timeFilters[0] = "attachment.attach-time";
timeFilters[1] = "create-time";
request = toVolumeFilterSet(request, fst, timeFilters);
}
@ -2070,24 +2070,24 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface {
public static String toAmazonStateName(String cloudState) {
if (null == cloudState)
return new String("terminated");
return "terminated";
if (cloudState.equalsIgnoreCase("Destroyed"))
return new String("terminated");
return "terminated";
else if (cloudState.equalsIgnoreCase("Stopped"))
return new String("stopped");
return "stopped";
else if (cloudState.equalsIgnoreCase("Running"))
return new String("running");
return "running";
else if (cloudState.equalsIgnoreCase("Starting"))
return new String("pending");
return "pending";
else if (cloudState.equalsIgnoreCase("Stopping"))
return new String("stopping");
return "stopping";
else if (cloudState.equalsIgnoreCase("Error"))
return new String("error");
return "error";
else if (cloudState.equalsIgnoreCase("Expunging"))
return new String("terminated");
return "terminated";
else
return new String("running");
return "running";
}
public static StopInstancesResponse toStopInstancesResponse(EC2StopInstancesResponse engineResponse) {

6
awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
View File

@ -2233,9 +2233,9 @@ public class EC2Engine extends ManagerBase {
perm.setProtocol(rule.getProtocol());
perm.setFromPort(rule.getStartPort());
perm.setToPort(rule.getEndPort());
perm.setRuleId(rule.getRuleId() != null ? rule.getRuleId().toString() : new String());
perm.setIcmpCode(rule.getIcmpCode() != null ? rule.getIcmpCode().toString() : new String());
perm.setIcmpType(rule.getIcmpType() != null ? rule.getIcmpType().toString() : new String());
perm.setRuleId(rule.getRuleId() != null ? rule.getRuleId().toString() : "");
perm.setIcmpCode(rule.getIcmpCode() != null ? rule.getIcmpCode().toString() : "");
perm.setIcmpType(rule.getIcmpType() != null ? rule.getIcmpType().toString() : "");
perm.setCIDR(rule.getCidr());
perm.addIpRange(rule.getCidr());

2
awsapi/src/com/cloud/bridge/util/EC2RestAuth.java
View File

@ -120,7 +120,7 @@ public class EC2RestAuth {
public void setHTTPRequestURI(String uri) {
if (null == uri || 0 == uri.length())
this.httpRequestURI = new String("/");
this.httpRequestURI = "/";
else
this.httpRequestURI = uri.trim();
}