svn commit: r1787915 - in /ofbiz/branches/release16.11: ./ applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java

Author: jleroux
Date: Tue Mar 21 09:20:09 2017
New Revision: 1787915

URL: http://svn.apache.org/viewvc?rev=1787915&view=rev
Log:
"Applied fix from trunk framework for revision: 1787908"
------------------------------------------------------------------------
r1787908 | jleroux | 2017-03-21 09:55:47 +0100 (mar. 21 mars 2017) | 2 lignes

No functional changes, fixes a bunch of swallowed exceptions and uses a catch
multi
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java
    ofbiz/branches/release16.11/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 21 09:20:09 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,1787906-1787907
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787627,1787823,1787906-1787908
 /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/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java?rev=1787915&r1=1787914&r2=1787915&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java (original)
+++ ofbiz/branches/release16.11/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java Tue Mar 21 09:20:09 2017
@@ -269,6 +269,7 @@ public final class ContentManagementWork
             try {
                 currentValue = EntityQuery.use(delegator).from(currentPK.getEntityName()).where(currentPK).queryOne();
             } catch (GenericEntityException e) {
+                Debug.logError(e.getMessage(), module);
             }
             request.setAttribute("currentValue", currentValue);
         }
@@ -543,8 +544,8 @@ public final class ContentManagementWork
                 authorContent.setPKFields(value);
                 authorContent.setNonPKFields(value);
             }
-        } catch (GenericEntityException e) {
-        } catch (MiniLangException e2) {
+        } catch (GenericEntityException | MiniLangException e) {
+            Debug.logError(e.getMessage(), module);
         }
 
         return authorContent;

Modified: ofbiz/branches/release16.11/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java?rev=1787915&r1=1787914&r2=1787915&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java (original)
+++ ofbiz/branches/release16.11/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java Tue Mar 21 09:20:09 2017
@@ -1245,6 +1245,7 @@ public class ContentWorker implements or
         try {
             getContentTypeAncestry(delegator, contentTypeId, contentTypeAncestry);
         } catch (GenericEntityException e) {
+            Debug.logError(e.getMessage(), module);
         }
         context.put("typeAncestry", contentTypeAncestry);
         boolean isReturnBefore = checkWhen(context, (String)whenMap.get("returnBeforePickWhen"), false);