From: Shiwei Tian <tian.shiwei@zte.com.cn>
Date: Thu, 12 Oct 2017 03:08:02 +0000 (+0800)
Subject: modify deploy rule bug
X-Git-Tag: v1.0.0~22^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F23%2F18423%2F1;p=holmes%2Frule-management.git

modify deploy rule bug

Issue-ID: HOLMES-44

Change-Id: Ib8ae03aee13144638c64978d97be2caff709c038
Signed-off-by: Shiwei Tian <tian.shiwei@zte.com.cn>
---

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
--- 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) {
             throw new CorrelationException("A rule with the same name already exists.");
         }
+        
         String packageName = deployRule2Engine(correlationRule);
         DmaapService.loopControlNames.put(packageName, ruleCreateRequest.getLoopControlName());
         correlationRule.setPackageName(packageName);
-        CorrelationRule result = correlationRuleDao.saveRule(correlationRule);
+        CorrelationRule result = null;
+        try {
+            result = correlationRuleDao.saveRule(correlationRule);
+        } catch (CorrelationException e) {
+            engineWarpper.deleteRuleFromEngine(packageName);
+            throw new CorrelationException(e.getMessage());
+        }
         RuleAddAndUpdateResponse ruleAddAndUpdateResponse = new RuleAddAndUpdateResponse();
         ruleAddAndUpdateResponse.setRuleId(result.getRid());
         return ruleAddAndUpdateResponse;