From 5c93c3d2829fd6cf480848aa5aafa8879c17d28a Mon Sep 17 00:00:00 2001
From: Andreas Wundsam <andreas.wundsam@bigswitch.com>
Date: Fri, 4 Jan 2013 09:37:48 -0800
Subject: [PATCH] floodlight: statisticsmessagebase: fix possible NPE
---
.../java/org/openflow/protocol/OFStatisticsMessageBase.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/openflow/protocol/OFStatisticsMessageBase.java b/src/main/java/org/openflow/protocol/OFStatisticsMessageBase.java
index 9b3a6ca60..e5a9c01e0 100644
--- a/src/main/java/org/openflow/protocol/OFStatisticsMessageBase.java
+++ b/src/main/java/org/openflow/protocol/OFStatisticsMessageBase.java
@@ -88,7 +88,10 @@ public abstract class OFStatisticsMessageBase extends OFMessage implements
* element
*/
public OFStatistics getFirstStatistics() {
- if (statistics == null || statistics.size() != 1) {
+ if (statistics == null ) {
+ throw new IllegalArgumentException("Invariant violation: statistics message of type "+statisticType+" is null");
+ }
+ if (statistics.size() != 1) {
throw new IllegalArgumentException("Invariant violation: statistics message of type "+statisticType+" contains "+statistics.size() +" statreq/reply messages in its body (should be 1)");
}
--
GitLab