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

CS-14970. "java.lang.NumberFormatException" seen when ec2-describe-groups used to list ingress rules 

and if any of the icmp rules has a type or code of value '-1'.
Update EC2GroupFilterSet to match the filter values with a regular expression and not an integer.
This commit is contained in:
Likitha Shetty 2012-05-18 15:18:18 +05:30
parent 691b9a471c
commit 52351b14a0
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
awsapi/src/com/cloud/bridge/service/core/ec2/EC2GroupFilterSet.java
View File

@ -133,14 +133,14 @@ public class EC2GroupFilterSet {
matched = containsString(perm.getCIDR(), valueSet);
else if (filterName.equalsIgnoreCase( "ip-permission.from-port" )) {
if (perm.getProtocol().equalsIgnoreCase("icmp"))
matched = containsInteger(Integer.parseInt(perm.getIcmpType()), valueSet);
matched = containsString(perm.getIcmpType(), valueSet);
else
matched = containsInteger(perm.getFromPort(), valueSet);
matched = containsString(perm.getFromPort().toString(), valueSet);
} else if (filterName.equalsIgnoreCase( "ip-permission.to-port" )) {
if (perm.getProtocol().equalsIgnoreCase("icmp"))
matched = containsInteger(Integer.parseInt(perm.getIcmpCode()), valueSet);
matched = containsString(perm.getIcmpCode(), valueSet);
else
matched = containsInteger( perm.getToPort(), valueSet );
matched = containsString( perm.getToPort().toString(), valueSet );
} else if (filterName.equalsIgnoreCase( "ip-permission.protocol" ))
matched = containsString( perm.getProtocol(), valueSet );
if (!matched) break;
@ -162,14 +162,4 @@ public class EC2GroupFilterSet {
return false;
}
private boolean containsInteger( int lookingFor, String[] set )
{
for (String s : set) {
//System.out.println( "contsinsInteger: " + lookingFor + " " + set[i] );
int temp = Integer.parseInt( s );
if (lookingFor == temp) return true;
}
return false;
}
}