svn commit: r1787913 - in /ofbiz/branches/release16.11: ./ applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/

Author: jleroux
Date: Tue Mar 21 09:19:28 2017
New Revision: 1787913

URL: http://svn.apache.org/viewvc?rev=1787913&view=rev
Log:
"Applied fix from trunk framework for revision: 1787906"
------------------------------------------------------------------------
r1787906 | jleroux | 2017-03-21 09:40:07 +0100 (mar. 21 mars 2017) | 1 ligne

No functional changes, fixes a bunch of swallowed exceptions
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
    ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartEvents.java
    ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 21 09:19:28 2017
@@ -10,5 +10,5 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787627,1787823
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787627,1787823,1787906
 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520

Modified: ofbiz/branches/release16.11/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?rev=1787913&r1=1787912&r2=1787913&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java (original)
+++ ofbiz/branches/release16.11/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java Tue Mar 21 09:19:28 2017
@@ -2208,10 +2208,10 @@ public class ProductionRunServices {
                             }
                        }
                     }
-                } catch (GenericEntityException gee) {
-
-                } catch (GenericServiceException gee) {
-
+                } catch (GenericEntityException | GenericServiceException e) {
+                    String errMsg = "Problem calling the updateProductionRunTaskStatus service";
+                    Debug.logError(e, errMsg, module);
+                    return ServiceUtil.returnError(errMsg);
                 }
             }
         }
@@ -2258,7 +2258,10 @@ public class ProductionRunServices {
         GenericValue requirement = null;
         try {
             requirement = EntityQuery.use(delegator).from("Requirement").where("requirementId", requirementId).queryOne();
-        } catch (GenericEntityException gee) {
+        } catch (GenericEntityException e) {
+            String errMsg = "Problem calling the approveRequirement service";
+            Debug.logError(e, errMsg, module);
+            return ServiceUtil.returnError(errMsg);
         }
 
         if (requirement == null) {
@@ -2289,7 +2292,10 @@ public class ProductionRunServices {
         GenericValue requirement = null;
         try {
             requirement = EntityQuery.use(delegator).from("Requirement").where("requirementId", requirementId).queryOne();
-        } catch (GenericEntityException gee) {
+        } catch (GenericEntityException e) {
+            String errMsg = "Problem calling the createProductionRunFromRequirement service";
+            Debug.logError(e, errMsg, module);
+            return ServiceUtil.returnError(errMsg);
         }
         if (requirement == null) {
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingRequirementNotExists", locale));

Modified: ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartEvents.java?rev=1787913&r1=1787912&r2=1787913&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartEvents.java (original)
+++ ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartEvents.java Tue Mar 21 09:19:28 2017
@@ -1624,7 +1624,8 @@ public class ShoppingCartEvents {
                                     .filterByDate()
                                     .queryList();
                         } catch (GenericEntityException gee) {
-                            //
+                            request.setAttribute("_ERROR_MESSAGE_", gee.getMessage());
+                            return "error";
                         }
                         if (UtilValidate.isNotEmpty(storeReps)) {
                             hasPermission = true;
@@ -1674,7 +1675,8 @@ public class ShoppingCartEvents {
                 try {
                     thisUserLogin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", userLoginId).queryOne();
                 } catch (GenericEntityException gee) {
-                    //
+                    request.setAttribute("_ERROR_MESSAGE_", gee.getMessage());
+                    return "error";
                 }
                 if (thisUserLogin != null) {
                     partyId = thisUserLogin.getString("partyId");
@@ -1687,7 +1689,8 @@ public class ShoppingCartEvents {
                 try {
                     thisParty = EntityQuery.use(delegator).from("Party").where("partyId", partyId).queryOne();
                 } catch (GenericEntityException gee) {
-                    //
+                    request.setAttribute("_ERROR_MESSAGE_", gee.getMessage());
+                    return "error";
                 }
                 if (thisParty == null) {
                     request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resource_error,"OrderCouldNotLocateTheSelectedParty", locale));

Modified: ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java?rev=1787913&r1=1787912&r2=1787913&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java (original)
+++ ofbiz/branches/release16.11/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java Tue Mar 21 09:19:28 2017
@@ -516,6 +516,7 @@ public class ShoppingCartHelper {
                 try {
                     requirement = EntityQuery.use(delegator).from("Requirement").where("requirementId", requirementId).queryOne();
                 } catch (GenericEntityException gee) {
+                    Debug.logError(gee, module);
                 }
                 if (requirement == null) {
                     return ServiceUtil.returnFailure(UtilProperties.getMessage(resource,