diff --git a/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java index d44f1d1101e..a1e8171537b 100644 --- a/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java +++ b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java @@ -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) { diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java index ef7539f7350..cd202145402 100644 --- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java +++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java @@ -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()); diff --git a/awsapi/src/com/cloud/bridge/util/EC2RestAuth.java b/awsapi/src/com/cloud/bridge/util/EC2RestAuth.java index d2f4b1e1b08..33368c10fe5 100644 --- a/awsapi/src/com/cloud/bridge/util/EC2RestAuth.java +++ b/awsapi/src/com/cloud/bridge/util/EC2RestAuth.java @@ -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(); }