Merge pull request #497 from JamesMerfeld/master

Corrected bug that was generating an exception when retrieving the icmpv...

src/main/java/net/floodlightcontroller/staticflowentry/web/StaticFlowEntryPusherResource.java

@@ -124,7 +124,7 @@ public class StaticFlowEntryPusherResource extends ServerResource {
 		if (rows.containsKey(StaticFlowEntryPusher.COLUMN_ICMP6_TYPE)) {
 			icmp6_type = true;
 			ip6 = true;
-			if (((String) rows.get(StaticFlowEntryPusher.COLUMN_ICMP_TYPE)).startsWith("0x")) {
+			if (((String) rows.get(StaticFlowEntryPusher.COLUMN_ICMP6_TYPE)).startsWith("0x")) {
 				icmp_type = Integer.parseInt(((String) rows.get(StaticFlowEntryPusher.COLUMN_ICMP6_TYPE)).replaceFirst("0x", ""), 16);
 			} else {
 				icmp_type = Integer.parseInt((String) rows.get(StaticFlowEntryPusher.COLUMN_ICMP6_TYPE));