commit | da9038e7a4b7d4b1d8b9bc397558eb63e048ebca | [log] [tgz] |
---|---|---|
author | Yi Tseng <a86487817@gmail.com> | Fri Feb 17 15:56:32 2017 -0800 |
committer | Ray Milkey <ray@onlab.us> | Sat Feb 18 00:51:37 2017 +0000 |
tree | 4602c77337c636b86d028749f6692d04f7c5518b | |
parent | dbd9b6a8863861767d13f2e37230cc0ab32e237c [diff] |
Resolve NullPointerException when release resource Change-Id: I1cd5dc20b9506ad934cebe5e7a2a7dfdadc170ea
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java index 7b79f95..353af4d 100644 --- a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java +++ b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
@@ -384,7 +384,10 @@ // related resources. Long remainingIntents = Tools.stream(store.getIntents()) - .filter(i -> i.resourceGroup().equals(intent.resourceGroup())) + .filter(i -> { + return i.resourceGroup() != null + && i.resourceGroup().equals(intent.resourceGroup()); + }) .count(); if (remainingIntents == 0) { removeResource = true;