issue binarywang#47 rule的reEnter判断时机过迟的问题

chanjarster · chanjarster · commit 24b1e9b4eb5d · 2014-12-01T22:12:39.000+08:00
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageRouter.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageRouter.java
@@ -77,6 +77,9 @@ public WxCpXmlOutMessage route(final WxCpXmlMessage wxMessage) {
     for (final Rule rule : rules) {
       if (rule.test(wxMessage)) {
         matchRules.add(rule);
+        if(!rule.reEnter) {
+          break;
+        }
       }
     }
 
@@ -91,9 +94,6 @@ public WxCpXmlOutMessage route(final WxCpXmlMessage wxMessage) {
         public void run() {
           for (final Rule rule : matchRules) {
             rule.service(wxMessage);
-            if (!rule.reEnter) {
-              break;
-            }
           }
         }
       });
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java
@@ -77,6 +77,9 @@ public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage) {
     for (final Rule rule : rules) {
       if (rule.test(wxMessage)) {
         matchRules.add(rule);
+        if(!rule.reEnter) {
+          break;
+        }
       }
     }
     
@@ -91,9 +94,6 @@ public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage) {
         public void run() {
           for (final Rule rule : matchRules) {
             rule.service(wxMessage);
-            if (!rule.reEnter) {
-              break;
-            }
           }
         }
       });

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,9 @@ public WxCpXmlOutMessage route(final WxCpXmlMessage wxMessage) {`
`77`	`77`	`for (final Rule rule : rules) {`
`78`	`78`	`if (rule.test(wxMessage)) {`
`79`	`79`	`matchRules.add(rule);`
	`80`	`+ if(!rule.reEnter) {`
	`81`	`+ break;`
	`82`	`+ }`
`80`	`83`	`}`
`81`	`84`	`}`
`82`	`85`
`@@ -91,9 +94,6 @@ public WxCpXmlOutMessage route(final WxCpXmlMessage wxMessage) {`
`91`	`94`	`public void run() {`
`92`	`95`	`for (final Rule rule : matchRules) {`
`93`	`96`	`rule.service(wxMessage);`
`94`		`- if (!rule.reEnter) {`
`95`		`- break;`
`96`		`- }`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`	`});`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,9 @@ public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage) {`
`77`	`77`	`for (final Rule rule : rules) {`
`78`	`78`	`if (rule.test(wxMessage)) {`
`79`	`79`	`matchRules.add(rule);`
	`80`	`+ if(!rule.reEnter) {`
	`81`	`+ break;`
	`82`	`+ }`
`80`	`83`	`}`
`81`	`84`	`}`
`82`	`85`
`@@ -91,9 +94,6 @@ public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage) {`
`91`	`94`	`public void run() {`
`92`	`95`	`for (final Rule rule : matchRules) {`
`93`	`96`	`rule.service(wxMessage);`
`94`		`- if (!rule.reEnter) {`
`95`		`- break;`
`96`		`- }`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`	`});`