Fix compileRule

Change-Id: Iccf00f37ead7c330e3ca82882166b753f16a5bdb
Issue-ID: HOLMES-47
Signed-off-by: FengLiang <feng.liang1@zte.com.cn>

diff --git a/engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java b/engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java
index a97cae9..f8d9626 100644 (file)
--- a/engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java
+++ b/engine-d/src/main/java/org/openo/holmes/engine/manager/DroolsEngine.java
@@ -162,7 +162,7 @@ public class DroolsEngine {
 \r
         kbuilder.add(res, ResourceType.DRL);\r
 \r
-        judgeRuleContent(locale, kbuilder);\r
+        judgeRuleContent(locale, kbuilder, true);\r
 \r
         String packageName = kbuilder.getKnowledgePackages().iterator().next().getName();\r
         try {\r
@@ -210,10 +210,10 @@ public class DroolsEngine {
 \r
         kbuilder.add(res, ResourceType.DRL);\r
 \r
-        judgeRuleContent(locale, kbuilder);\r
+        judgeRuleContent(locale, kbuilder, false);\r
     }\r
 \r
-    private void judgeRuleContent(Locale locale, KnowledgeBuilder kbuilder)\r
+    private void judgeRuleContent(Locale locale, KnowledgeBuilder kbuilder, boolean judgePackageName)\r
         throws CorrelationException {\r
         if (kbuilder.hasErrors()) {\r
             String errorMsg = I18nProxy.getInstance().getValueByArgs(locale,\r
@@ -225,7 +225,7 @@ public class DroolsEngine {
 \r
         String packageName = kbuilder.getKnowledgePackages().iterator().next().getName();\r
 \r
-        if (packageNames.contains(packageName)) {\r
+        if (packageNames.contains(packageName) && judgePackageName) {\r
             String errorMsg = I18nProxy.getInstance().getValueByArgs(locale,\r
                 I18nProxy.ENGINE_CONTENT_ILLEGALITY, new String[]{\r
                     I18nProxy.getInstance().getValue(locale, I18nProxy.ENGINE_CONTAINS_PACKAGE)});\r