홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Pavlin Radoslavov
deb8a109 1 parent 486349db

Fix for bug ONOS-330: 

Add missing "null" checks for IntentService.getIntentState()

Change-Id: Idd574227636f6cdd3a0dbae4c753ada6157e04e1
Inline Side-by-side
Showing 2 changed files with 9 additions and 3 deletions
......@@ -126,7 +126,8 @@ public class IntentSynchronizer {
// Skip the intents that are already withdrawn
IntentState intentState =
intentService.getIntentState(intent.id());
if (intentState.equals(IntentState.WITHDRAWING) ||
if ((intentState == null) ||
intentState.equals(IntentState.WITHDRAWING) ||
intentState.equals(IntentState.WITHDRAWN)) {
continue;
}
......@@ -461,7 +462,8 @@ public class IntentSynchronizer {
IntentState state =
intentService.getIntentState(fetchedIntent.id());
if (state == IntentState.WITHDRAWING ||
if (state == null ||
state == IntentState.WITHDRAWING ||
state == IntentState.WITHDRAWN) {
// The intent has been withdrawn but according to our route
// table it should be installed. We'll reinstall it.
......@@ -482,7 +484,8 @@ public class IntentSynchronizer {
IntentState state =
intentService.getIntentState(fetchedIntent.id());
if (state == IntentState.WITHDRAWING ||
if (state == null ||
state == IntentState.WITHDRAWING ||
state == IntentState.WITHDRAWN) {
// Nothing to do. The intent has been already withdrawn.
continue;
......
......@@ -126,6 +126,9 @@ public class IntentsListCommand extends AbstractShellCommand {
// Collect the summary for each intent type intents
for (Intent intent : intents) {
IntentState intentState = service.getIntentState(intent.id());
if (intentState == null) {
continue;
}
// Update the summary for all Intents
summaryAll.update(intentState);
......