From cd4534baa711336bec8622a6b71a41c37e26b39c Mon Sep 17 00:00:00 2001 From: Vishal Thapar Date: Fri, 22 May 2015 13:04:57 +0530 Subject: [PATCH] BUG 3292: Fix in MatchType for in_port 1. Replace getMatchValues with getBigMatchValues 2. Log stacktrace, not just exception for NPE in install/remove flow/group Change-Id: I9ee4093b028bda864fd554e95306df032a494038 Signed-off-by: Vishal Thapar --- .../opendaylight/vpnservice/mdsalutil/MatchFieldType.java | 4 ++-- .../vpnservice/mdsalutil/internal/MDSALManager.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/vpnservice/mdsalutil/MatchFieldType.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/vpnservice/mdsalutil/MatchFieldType.java index 2b4dac70..b889f1e5 100644 --- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/vpnservice/mdsalutil/MatchFieldType.java +++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/vpnservice/mdsalutil/MatchFieldType.java @@ -163,8 +163,8 @@ public enum MatchFieldType { @Override public void setMatch(MatchBuilder matchBuilderInOut, MatchInfo matchInfo, Map, Object> mapMatchBuilder) { - StringBuffer nodeConnectorId = new StringBuffer().append("openflow:").append(matchInfo.getMatchValues()[0]) - .append(':').append(matchInfo.getMatchValues()[1]); + StringBuffer nodeConnectorId = new StringBuffer().append("openflow:").append(matchInfo.getBigMatchValues()[0]) + .append(':').append(matchInfo.getBigMatchValues()[1]); matchBuilderInOut.setInPort(new NodeConnectorId(nodeConnectorId.toString())); } }, diff --git a/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/vpnservice/mdsalutil/internal/MDSALManager.java b/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/vpnservice/mdsalutil/internal/MDSALManager.java index 8fe95ef1..fc9a5ff7 100644 --- a/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/vpnservice/mdsalutil/internal/MDSALManager.java +++ b/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/vpnservice/mdsalutil/internal/MDSALManager.java @@ -124,7 +124,7 @@ public class MDSALManager implements AutoCloseable { } }); } catch (Exception e) { - s_logger.error("Could not install flow: {}, exception: {}", flowEntity, e); + s_logger.error("Could not install flow: {}", flowEntity, e); } } @@ -165,7 +165,7 @@ public class MDSALManager implements AutoCloseable { } }); } catch (Exception e) { - s_logger.error("Could not install Group: {}, exception: {}", groupEntity, e); + s_logger.error("Could not install Group: {}", groupEntity, e); throw e; } } @@ -205,7 +205,7 @@ public class MDSALManager implements AutoCloseable { }); } catch (Exception e) { - s_logger.error("Could not remove Flow: {}, exception: {}", flowEntity, e); + s_logger.error("Could not remove Flow: {}", flowEntity, e); } } @@ -242,7 +242,7 @@ public class MDSALManager implements AutoCloseable { } }); } catch (Exception e) { - s_logger.error("Could not remove Group: {}, exception: {}", groupEntity, e); + s_logger.error("Could not remove Group: {}", groupEntity, e); } } -- 2.36.6