diff --git a/easyrules-core/src/main/java/org/easyrules/core/ActionMethodOrderBean.java b/easyrules-core/src/main/java/org/easyrules/core/ActionMethodOrderBean.java index 21f10d5..25d59c5 100644 --- a/easyrules-core/src/main/java/org/easyrules/core/ActionMethodOrderBean.java +++ b/easyrules-core/src/main/java/org/easyrules/core/ActionMethodOrderBean.java @@ -28,7 +28,13 @@ class ActionMethodOrderBean implements Comparable { @Override public int compareTo(ActionMethodOrderBean actionMethodOrderBean) { - return new Integer(order).compareTo(actionMethodOrderBean.getOrder()); + if (order < actionMethodOrderBean.getOrder()) { + return -1; + } else if (order > actionMethodOrderBean.getOrder()) { + return 1; + } else { + return method.equals(actionMethodOrderBean.getMethod()) ? 0 : 1; + } } @Override diff --git a/easyrules-core/src/main/java/org/easyrules/core/RulePriorityBean.java b/easyrules-core/src/main/java/org/easyrules/core/RulePriorityBean.java index 1172d95..7f86889 100644 --- a/easyrules-core/src/main/java/org/easyrules/core/RulePriorityBean.java +++ b/easyrules-core/src/main/java/org/easyrules/core/RulePriorityBean.java @@ -26,7 +26,13 @@ class RulePriorityBean implements Comparable { @Override public int compareTo(RulePriorityBean ruleBean) { - return new Integer(priority).compareTo(ruleBean.getPriority()); + if (priority < ruleBean.getPriority()) { + return -1; + } else if (priority > ruleBean.getPriority()) { + return 1; + } else { + return rule.equals(ruleBean.getRule()) ? 0 : 1; + } } @Override