Upgrade sonar plugin

[vid.git] / vid-app-common / src / main / java / org / openecomp / vid / asdc / local / LocalAsdcClient.java

diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/local/LocalAsdcClient.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/local/LocalAsdcClient.java
index 8538f6b..696e189 100644 (file)
--- a/vid-app-common/src/main/java/org/openecomp/vid/asdc/local/LocalAsdcClient.java
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/local/LocalAsdcClient.java
@@ -264,7 +264,7 @@ public class LocalAsdcClient implements AsdcClient {
      * @see org.openecomp.vid.asdc.AsdcClient#getResourceArtifact(java.util.UUID, java.util.UUID)
      */
     public Artifact getResourceArtifact(UUID resourceUuid, UUID artifactUuid) throws AsdcCatalogException {
-        final JSONArray artifacts = getCatalog().getJSONObject("resources")
+        final  JSONArray artifacts = getCatalog().getJSONObject("resources")
                 .getJSONObject(resourceUuid.toString())
                 .getJSONArray("artifacts");
 
@@ -328,9 +328,14 @@ public class LocalAsdcClient implements AsdcClient {
             JSONObject jsonServiceObject = categoryJsonArray.getJSONObject(i);
             if (jsonServiceObject.get("uuid").equals(serviceUuid.toString())) {
                 toscaModelURL = jsonServiceObject.getString("toscaModelURL");
+                break;
             }
         }
 
+        if (toscaModelURL==null){
+            return null;
+        }
+        
         final InputStream toscaModelStream = getClass().getClassLoader().getResourceAsStream(toscaModelURL);
 
         ClassLoader classLoader = getClass().getClassLoader();