You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2011/03/02 08:02:08 UTC
svn commit: r1076123 - in /ofbiz/branches/release10.04: ./
applications/content/src/org/ofbiz/content/content/
applications/content/src/org/ofbiz/content/data/
Author: jleroux
Date: Wed Mar 2 07:02:08 2011
New Revision: 1076123
URL: http://svn.apache.org/viewvc?rev=1076123&view=rev
Log:
"Applied fix from trunk for revision: 1076115"
------------------------------------------------------------------------
r1076115 | jleroux | 2011-03-02 07:34:18 +0100 (mer., 02 mars 2011) | 1 line
Fix possible NPEs in Content Component reported by Dimitri Valax on dev ML, close https://issues.apache.org/jira/browse/OFBIZ-4198 - OFBIZ-4198
------------------------------------------------------------------------
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java
ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/content/ContentWorker.java
ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 2 07:02:08 2011
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990
539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031,1050602,1051111,1051450,1051812,1052195,1053285,1053289,1054565,1055057,1056072,1056305,1056803,1057519,1058028,1058056,1058488,1059180,1060236,1060261,1060368,1060933,1061167,1061307,1061346,1061886,1061939,1062138,1062144,1062152,1063273,1064090,1064953,1064993,1065550,1066048,1067097,1067942,1069597,1069965,1070193,1070229,1072017,1072378,1074624,1075205,1075952
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990
539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031,1050602,1051111,1051450,1051812,1052195,1053285,1053289,1054565,1055057,1056072,1056305,1056803,1057519,1058028,1058056,1058488,1059180,1060236,1060261,1060368,1060933,1061167,1061307,1061346,1061886,1061939,1062138,1062144,1062152,1063273,1064090,1064953,1064993,1065550,1066048,1067097,1067942,1069597,1069965,1070193,1070229,1072017,1072378,1074624,1075205,1075952,10761
15
Modified: ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java?rev=1076123&r1=1076122&r2=1076123&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java (original)
+++ ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java Wed Mar 2 07:02:08 2011
@@ -289,52 +289,46 @@ public class ContentPermissionServices {
boolean isMatchTo = false;
boolean isMatchFrom = false;
Map permResults = FastMap.newInstance();
- String skipPermissionCheck = null;
- if (UtilValidate.isEmpty(skipPermissionCheck)
- || (!skipPermissionCheck.equalsIgnoreCase("true") && !skipPermissionCheck.equalsIgnoreCase("granted"))) {
- // Use the purposes from the from entity for both cases.
- List relatedPurposes = EntityPermissionChecker.getRelatedPurposes(contentFrom, null);
- List relatedPurposesTo = EntityPermissionChecker.getRelatedPurposes(contentTo, relatedPurposes);
- Map serviceInMap = FastMap.newInstance();
- serviceInMap.put("userLogin", userLogin);
- serviceInMap.put("targetOperationList", UtilMisc.toList("CONTENT_LINK_TO"));
- serviceInMap.put("contentPurposeList", relatedPurposesTo);
- serviceInMap.put("currentContent", contentTo);
- serviceInMap.put("displayFailCond", bDisplayFailCond);
+ // Use the purposes from the from entity for both cases.
+ List<String> relatedPurposes = EntityPermissionChecker.getRelatedPurposes(contentFrom, null);
+ List<String> relatedPurposesTo = EntityPermissionChecker.getRelatedPurposes(contentTo, relatedPurposes);
+ Map<String, Object> serviceInMap = FastMap.newInstance();
+ serviceInMap.put("userLogin", userLogin);
+ serviceInMap.put("targetOperationList", UtilMisc.toList("CONTENT_LINK_TO"));
+ serviceInMap.put("contentPurposeList", relatedPurposesTo);
+ serviceInMap.put("currentContent", contentTo);
+ serviceInMap.put("displayFailCond", bDisplayFailCond);
- try {
- permResults = dispatcher.runSync("checkContentPermission", serviceInMap);
- } catch (GenericServiceException e) {
- Debug.logError(e, "Problem checking permissions", "ContentServices");
- }
- permissionStatus = (String)permResults.get("permissionStatus");
- if (permissionStatus == null || !permissionStatus.equals("granted")) {
- if (bDisplayFailCond != null && bDisplayFailCond.booleanValue()) {
- String errMsg = (String)permResults.get(ModelService.ERROR_MESSAGE);
- results.put(ModelService.ERROR_MESSAGE, errMsg);
- }
- return results;
- }
- serviceInMap.put("currentContent", contentFrom);
- serviceInMap.put("targetOperationList", UtilMisc.toList("CONTENT_LINK_FROM"));
- serviceInMap.put("contentPurposeList", relatedPurposes);
- try {
- permResults = dispatcher.runSync("checkContentPermission", serviceInMap);
- } catch (GenericServiceException e) {
- Debug.logError(e, "Problem checking permissions", "ContentServices");
- }
- permissionStatus = (String)permResults.get("permissionStatus");
- if (permissionStatus != null && permissionStatus.equals("granted")) {
- results.put("permissionStatus", "granted");
- } else {
- if (bDisplayFailCond != null && bDisplayFailCond.booleanValue()) {
- String errMsg = (String)permResults.get(ModelService.ERROR_MESSAGE);
- results.put(ModelService.ERROR_MESSAGE, errMsg);
- }
+ try {
+ permResults = dispatcher.runSync("checkContentPermission", serviceInMap);
+ } catch (GenericServiceException e) {
+ Debug.logError(e, "Problem checking permissions", "ContentServices");
+ }
+ permissionStatus = (String)permResults.get("permissionStatus");
+ if (permissionStatus == null || !permissionStatus.equals("granted")) {
+ if (bDisplayFailCond != null && bDisplayFailCond.booleanValue()) {
+ String errMsg = (String)permResults.get(ModelService.ERROR_MESSAGE);
+ results.put(ModelService.ERROR_MESSAGE, errMsg);
}
- } else {
+ return results;
+ }
+ serviceInMap.put("currentContent", contentFrom);
+ serviceInMap.put("targetOperationList", UtilMisc.toList("CONTENT_LINK_FROM"));
+ serviceInMap.put("contentPurposeList", relatedPurposes);
+ try {
+ permResults = dispatcher.runSync("checkContentPermission", serviceInMap);
+ } catch (GenericServiceException e) {
+ Debug.logError(e, "Problem checking permissions", "ContentServices");
+ }
+ permissionStatus = (String)permResults.get("permissionStatus");
+ if (permissionStatus != null && permissionStatus.equals("granted")) {
results.put("permissionStatus", "granted");
+ } else {
+ if (bDisplayFailCond != null && bDisplayFailCond.booleanValue()) {
+ String errMsg = (String)permResults.get(ModelService.ERROR_MESSAGE);
+ results.put(ModelService.ERROR_MESSAGE, errMsg);
+ }
}
return results;
}
Modified: ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/content/ContentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=1076123&r1=1076122&r2=1076123&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original)
+++ ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/content/ContentWorker.java Wed Mar 2 07:02:08 2011
@@ -1056,8 +1056,8 @@ public class ContentWorker implements or
Map permResults = FastMap.newInstance();
String skipPermissionCheck = (String) context.get("skipPermissionCheck");
- if (UtilValidate.isEmpty(skipPermissionCheck)
- || (!skipPermissionCheck.equalsIgnoreCase("true") && !skipPermissionCheck.equalsIgnoreCase("granted"))) {
+ if (UtilValidate.isEmpty(skipPermissionCheck)
+ || (!"true".equalsIgnoreCase(skipPermissionCheck) && !"granted".equalsIgnoreCase(skipPermissionCheck))) {
GenericValue userLogin = (GenericValue) context.get("userLogin");
Map serviceInMap = FastMap.newInstance();
serviceInMap.put("userLogin", userLogin);
Modified: ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=1076123&r1=1076122&r2=1076123&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original)
+++ ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Wed Mar 2 07:02:08 2011
@@ -291,8 +291,8 @@ public class DataResourceWorker impleme
String skipPermissionCheck = (String) context.get("skipPermissionCheck");
if (Debug.infoOn()) Debug.logInfo("in callDataResourcePermissionCheckResult, skipPermissionCheck:" + skipPermissionCheck,"");
- if (UtilValidate.isEmpty(skipPermissionCheck)
- || (!skipPermissionCheck.equalsIgnoreCase("true") && !skipPermissionCheck.equalsIgnoreCase("granted"))) {
+ if (UtilValidate.isEmpty(skipPermissionCheck)
+ || (!"true".equalsIgnoreCase(skipPermissionCheck) && !"granted".equalsIgnoreCase(skipPermissionCheck))) {
GenericValue userLogin = (GenericValue) context.get("userLogin");
Map<String, Object> serviceInMap = FastMap.newInstance();
serviceInMap.put("userLogin", userLogin);