1 files changed, 11 insertions, 2 deletions
diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/wrapper/ServiceTemplateWrapper.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/wrapper/ServiceTemplateWrapper.java
index c381c8aa..e9cec9d2 100644
--- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/wrapper/ServiceTemplateWrapper.java
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/wrapper/ServiceTemplateWrapper.java
@@ -112,14 +112,23 @@ public class ServiceTemplateWrapper {
       SubstitutionMapping stm = getSubstitutionMappingsByNodeTypeId(nodeTypeIds[i]);
       if (stm == null) {
         sts[i] = null;
-      } else {
-        sts[i] = getServiceTemplateById(stm.getServiceTemplateId());
+        continue;
       }
+      sts[i] = getServiceTemplate(stm, nodeTypeIds[i]);
     }
 
     return sts;
   }
 
+  private ServiceTemplate getServiceTemplate(SubstitutionMapping stm, String nodeTypeId) {
+    try {
+       return getServiceTemplateById(stm.getServiceTemplateId());
+    } catch (CatalogResourceException e) {
+      logger.warn("Get Nesting ServiceTemplate Failed. NodeTypeIds = " + nodeTypeId, e);
+      return null;
+    }
+  }
+
   /**
    * get substitution mappings by nodeTpe id.
    * @param nodeTypeId nodeType id