svn commit: r582473 - in /ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis: OagisInventoryServices.java OagisShipmentServices.java

[jonesde]

Author: jonesde
Date: Sat Oct  6 02:05:10 2007
New Revision: 582473

URL: http://svn.apache.org/viewvc?rev=582473&view=rev
Log:
Small logic change to make it easier to manually retry failed messages, with stuff like the re receive message service

Modified:
    ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java
    ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java

Modified: ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java?rev=582473&r1=582472&r2=582473&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java (original)
+++ ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java Sat Oct  6 02:05:10 2007
@@ -414,7 +414,7 @@
             // anything else to do about this? we don't really want to send the error back or anything...
         }
         
-        if (previousOagisMessageInfo != null) {
+        if (previousOagisMessageInfo != null && !isErrorRetry) {
             if ("OAGMP_SYS_ERROR".equals(previousOagisMessageInfo.getString("processingStatusId"))) {
                 isErrorRetry = true;
             } else {
@@ -719,7 +719,7 @@
             // anything else to do about this? we don't really want to send the error back or anything...
         }
         
-        if (previousOagisMessageInfo != null) {
+        if (previousOagisMessageInfo != null && !isErrorRetry) {
             if ("OAGMP_SYS_ERROR".equals(previousOagisMessageInfo.getString("processingStatusId"))) {
                 isErrorRetry = true;
             } else {
@@ -1249,7 +1249,7 @@
             // anything else to do about this? we don't really want to send the error back or anything...
         }
         
-        if (previousOagisMessageInfo != null) {
+        if (previousOagisMessageInfo != null && !isErrorRetry) {
             if ("OAGMP_SYS_ERROR".equals(previousOagisMessageInfo.getString("processingStatusId"))) {
                 isErrorRetry = true;
             } else {

Modified: ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java?rev=582473&r1=582472&r2=582473&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java (original)
+++ ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java Sat Oct  6 02:05:10 2007
@@ -146,7 +146,7 @@
             // anything else to do about this? we don't really want to send the error back or anything...
         }
         
-        if (previousOagisMessageInfo != null) {
+        if (previousOagisMessageInfo != null && !isErrorRetry) {
             if ("OAGMP_SYS_ERROR".equals(previousOagisMessageInfo.getString("processingStatusId"))) {
                 isErrorRetry = true;
             } else {