Suppress exception stack traces on warning conditions to prevent STC faiures for non-fatal situations
Change-Id: I10d4945e92b3674f00725597d00fc13cc140c943
diff --git a/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
index 51875b0..0ba3bd9 100644
--- a/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
+++ b/protocols/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
@@ -287,7 +287,7 @@
}
this.agent.processMessage(dpid, m);
} catch (Exception e) {
- log.warn("Unhandled exception processing {}@{}", m, dpid, e);
+ log.warn("Unhandled exception processing {}@{}:{}", m, dpid, e.getMessage());
}
} else {
log.trace("Dropping received message {}, was not MASTER", m);
diff --git a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFChannelHandler.java b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFChannelHandler.java
index 55ea65e..264629e 100644
--- a/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFChannelHandler.java
+++ b/protocols/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFChannelHandler.java
@@ -531,6 +531,11 @@
// Here is where we differentiate between different kinds of switches
h.sw = h.controller.getOFSwitchInstance(h.thisdpid, drep, h.ofVersion);
+ if (h.sw == null) {
+ log.info("Switch not found for {}", h.thisdpid);
+ return;
+ }
+
h.sw.setOFVersion(h.ofVersion);
h.sw.setFeaturesReply(h.featuresReply);
h.sw.setPortDescReplies(h.portDescReplies);