commit e6840cffd353b348034afaec05bb69eea41bc734
author Kavitha Alagesan <kalagesa@partner.ciena.com> Fri Oct 21 10:58:05 2016 +0530
committer Gerrit Code Review <gerrit@onlab.us> Fri Oct 28 13:43:40 2016 +0000
tree bdea53d0c9ea194c2445c181ab94fe5899ed6490
parent 4ed68b69430ea37fd66301ea25b475457fa4c670

ONOS-5545

Change-Id: Idf876826a7ad5cda82142beca490b3befe9551db

web/api/src/main/java/org/onosproject/rest/resources/IntentsWebResource.java

diff --git a/web/api/src/main/java/org/onosproject/rest/resources/IntentsWebResource.java b/web/api/src/main/java/org/onosproject/rest/resources/IntentsWebResource.java
index b22ea08..e9d1b9b 100644
--- a/web/api/src/main/java/org/onosproject/rest/resources/IntentsWebResource.java
+++ b/web/api/src/main/java/org/onosproject/rest/resources/IntentsWebResource.java
@@ -64,6 +64,7 @@
     private static final Logger log = getLogger(IntentsWebResource.class);
     private static final int WITHDRAW_EVENT_TIMEOUT_SECONDS = 5;
 
+    private static final String APP_ID_NOT_FOUND = "Application Id not found";
     private static final String INTENT_NOT_FOUND = "Intent is not found";
 
     /**
@@ -96,7 +97,7 @@
     public Response getIntentById(@PathParam("appId") String appId,
                                   @PathParam("key") String key) {
         final ApplicationId app = get(CoreService.class).getAppId(appId);
-
+        nullIsNotFound(app, APP_ID_NOT_FOUND);
         Intent intent = get(IntentService.class).getIntent(Key.of(key, app));
         if (intent == null) {
             long numericalKey = Long.decode(key);
@@ -188,7 +189,7 @@
     public Response deleteIntentById(@PathParam("appId") String appId,
                                      @PathParam("key") String key) {
         final ApplicationId app = get(CoreService.class).getAppId(appId);
-
+        nullIsNotFound(app, APP_ID_NOT_FOUND);
         Intent intent = get(IntentService.class).getIntent(Key.of(key, app));
         IntentService service = get(IntentService.class);