svn commit: r1804844 - /ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java

Author: jleroux
Date: Fri Aug 11 19:15:52 2017
New Revision: 1804844

URL: http://svn.apache.org/viewvc?rev=1804844&view=rev
Log:
Improved: Deprecated Methods in OrderChangeHelper
(OFBIZ-9570)

The methods abortOrderProcessing and releaseInitialOrderHold have been
deprecated since the workflow engine has been replaced by the ECA.
Both methods only return _true_ and other code code that uses these methods
is deprecated as well.

https://svn.apache.org/viewvc?view=revision&revision=665981
The revision in OrderChangeHelper shows that the methods used to have a
comment which stated that the methods are no longer in use.

jleroux: forgot to send the removing of some useless code


Thanks: Kyra Pritzel-Hentley for starting the analysis and creating the Jira

Modified:
    ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java

Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java?rev=1804844&r1=1804843&r2=1804844&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java Fri Aug 11 19:15:52 2017
@@ -2372,16 +2372,6 @@ public class OrderServices {
                     "OrderErrorCouldNotChangeOrderStatus",locale) + e.getMessage() + ").");
         }
 
-        // release the inital hold if we are cancelled or approved
-        if ("ORDER_CANCELLED".equals(statusId) || "ORDER_APPROVED".equals(statusId)) {
-            OrderChangeHelper.releaseInitialOrderHold(ctx.getDispatcher(), orderId);
-
-            // cancel any order processing if we are cancelled
-            if ("ORDER_CANCELLED".equals(statusId)) {
-                OrderChangeHelper.abortOrderProcessing(ctx.getDispatcher(), orderId);
-            }
-        }
-
         if ("Y".equals(context.get("setItemStatus"))) {
             String newItemStatusId = null;
             if ("ORDER_APPROVED".equals(statusId)) {