Merge "modify deploy rule bug"

diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapper.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapper.java
index 856171b..5c2a428 100644 (file)
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapper.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapper.java
@@ -73,10 +73,17 @@ public class RuleMgtWrapper {
         if (ruleTemp != null) {\r
             throw new CorrelationException("A rule with the same name already exists.");\r
         }\r
+        \r
         String packageName = deployRule2Engine(correlationRule);\r
         DmaapService.loopControlNames.put(packageName, ruleCreateRequest.getLoopControlName());\r
         correlationRule.setPackageName(packageName);\r
-        CorrelationRule result = correlationRuleDao.saveRule(correlationRule);\r
+        CorrelationRule result = null;\r
+        try {\r
+            result = correlationRuleDao.saveRule(correlationRule);\r
+        } catch (CorrelationException e) {\r
+            engineWarpper.deleteRuleFromEngine(packageName);\r
+            throw new CorrelationException(e.getMessage());\r
+        }\r
         RuleAddAndUpdateResponse ruleAddAndUpdateResponse = new RuleAddAndUpdateResponse();\r
         ruleAddAndUpdateResponse.setRuleId(result.getRid());\r
         return ruleAddAndUpdateResponse;\r