You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Scott Gray <sc...@hotwaxmedia.com> on 2011/06/26 13:28:01 UTC
Re: svn commit: r1139755 - in /ofbiz/branches/release10.04: ./ applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
This wasn't a bug in 10.04, I really don't like the idea of back porting any "fixes" without first verifying that it actually needs to be done.
Regards
Scott
On 26/06/2011, at 10:33 PM, jleroux@apache.org wrote:
> Author: jleroux
> Date: Sun Jun 26 10:33:25 2011
> New Revision: 1139755
>
> URL: http://svn.apache.org/viewvc?rev=1139755&view=rev
> Log:
> "Applied fix from trunk for revision: 1139504"
> ------------------------------------------------------------------------
> r1139504 | lektran | 2011-06-25 10:45:22 +0200 (sam., 25 juin 2011) | 1 line
>
> OFBIZ-4323 fix NPE bug reported by Javier Orrantia, screen xml documents rendered retrieved via the DataResourceWorker weren't using the correct UtilXml method that populates the xml documents userData.
> ------------------------------------------------------------------------
>
>
> Modified:
> ofbiz/branches/release10.04/ (props changed)
> ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
>
> Propchange: ofbiz/branches/release10.04/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sun Jun 26 10:33:25 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,943843,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,990
> 339,990539,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,1053722,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,107520
> 5,1075952,1076027,1076115,1080218,1080959,1083144,1084572,1084671,1084689,1084855,1085697,1085774,1090952,1090961,1090964,1092479,1094126,1096441,1098063,1104423,1131144,1132589,1132749,1134649,1134990,1135199,1135686,1137201,1137435,1139346,1139385
> +/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,943843,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,990
> 339,990539,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,1053722,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,107520
> 5,1075952,1076027,1076115,1080218,1080959,1083144,1084572,1084671,1084689,1084855,1085697,1085774,1090952,1090961,1090964,1092479,1094126,1096441,1098063,1104423,1131144,1132589,1132749,1134649,1134990,1135199,1135686,1137201,1137435,1139346,1139385,1139504
>
> 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=1139755&r1=1139754&r2=1139755&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 Sun Jun 26 10:33:25 2011
> @@ -716,7 +716,7 @@ public class DataResourceWorker impleme
> if ("URL_RESOURCE".equals(dataResource.getString("dataResourceTypeId")) && UtilValidate.isNotEmpty(combinedName) && combinedName.startsWith("component://")) {
> modelScreen = ScreenFactory.getScreenFromLocation(combinedName);
> } else { // stored in a single file, long or short text
> - Document screenXml = UtilXml.readXmlDocument(getDataResourceText(dataResource, targetMimeTypeId, locale, templateContext, delegator, cache), true);
> + Document screenXml = UtilXml.readXmlDocument(getDataResourceText(dataResource, targetMimeTypeId, locale, templateContext, delegator, cache), true, true);
> Map<String, ModelScreen> modelScreenMap = ScreenFactory.readScreenDocument(screenXml, "DataResourceId: " + dataResource.getString("dataResourceId"));
> if (UtilValidate.isNotEmpty(modelScreenMap)) {
> Map.Entry<String, ModelScreen> entry = modelScreenMap.entrySet().iterator().next(); // get first entry, only one screen allowed per file
>
>
Re: svn commit: r1139755 - in /ofbiz/branches/release10.04: ./ applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
Posted by Adrian Crum <ad...@sandglass-software.com>.
+1
Thanks Scott.
-Adrian
On 6/26/2011 9:47 PM, Scott Gray wrote:
> Bad reasons to justify a back port:
> - It compiles
> - It merges okay
> - The junit tests pass
>
> The only reasons to justify a back port:
> - The bug has been reproduced
> - A look at the code obviously shows that the bug exists
>
> Things a committer should NEVER do:
> - Commit code without understanding the problem or the solution
>
> Every time you commit something that hasn't been properly verified as a fix you risk introducing instability to our release branches which is the exact opposite of what we are trying to achieve and the exact opposite of what our users expect from those branches.
>
> Regards
> Scott
>
> On 27/06/2011, at 8:22 AM, Jacques Le Roux wrote:
>
>> I tested 9.04 it did not compile, I did not apply. Then I tested 10.04, it compiled, I thought it should be done. Same for R11.04
>>
>> Jacques
>>
>> Scott Gray wrote:
>>> This wasn't a bug in 10.04, I really don't like the idea of back porting any "fixes" without first verifying that it actually
>>> needs to be done. Regards
>>> Scott
>>> On 26/06/2011, at 10:33 PM, jleroux@apache.org wrote:
>>>> Author: jleroux
>>>> Date: Sun Jun 26 10:33:25 2011
>>>> New Revision: 1139755
>>>> URL: http://svn.apache.org/viewvc?rev=1139755&view=rev
>>>> Log:
>>>> "Applied fix from trunk for revision: 1139504"
>>>> ------------------------------------------------------------------------
>>>> r1139504 | lektran | 2011-06-25 10:45:22 +0200 (sam., 25 juin 2011) | 1 line
>>>> OFBIZ-4323 fix NPE bug reported by Javier Orrantia, screen xml documents rendered retrieved via the DataResourceWorker weren't
>>>> using the correct UtilXml method that populates the xml documents userData.
>>>> ------------------------------------------------------------------------
>>>> Modified:
>>>> ofbiz/branches/release10.04/ (props changed)
>>>> ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
>>>> Propchange: ofbiz/branches/release10.04/
>>>> ------------------------------------------------------------------------------
>>>> --- svn:mergeinfo (original)
>>>> +++ svn:mergeinfo Sun Jun 26 10:33:25 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,943843,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,990
>>>> 339,990539,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,1053722,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,107520
>>>> 5,1075952,1076027,1076115,1080218,1080959,1083144,1084572,1084671,1084689,1084855,1085697,1085774,1090952,1090961,1090964,1092479,1094126,1096441,1098063,1104423,1131144,1132589,1132749,1134649,1134990,1135199,1135686,1137201,1137435,1139346,1139385
>>>> +/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,943843,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,990
>>>> 339,990539,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,1053722,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,107520
>>>> 5,1075952,1076027,1076115,1080218,1080959,1083144,1084572,1084671,1084689,1084855,1085697,1085774,1090952,1090961,1090964,1092479,1094126,1096441,1098063,1104423,1131144,1132589,1132749,1134649,1134990,1135199,1135686,1137201,1137435,1139346,1139385,1139504
>>>> 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=1139755&r1=1139754&r2=1139755&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 Sun Jun 26 10:33:25 2011 @@
>>>> -716,7 +716,7 @@ public class DataResourceWorker impleme if
>>>> ("URL_RESOURCE".equals(dataResource.getString("dataResourceTypeId"))&&
>>>> UtilValidate.isNotEmpty(combinedName)&& combinedName.startsWith("component://")) { modelScreen =
>>>> ScreenFactory.getScreenFromLocation(combinedName); } else { // stored in a single file, long or short text - Document screenXml = UtilXml.readXmlDocument(getDataResourceText(dataResource, targetMimeTypeId, locale, templateContext,
>>>> delegator, cache), true); + Document screenXml =
>>>> UtilXml.readXmlDocument(getDataResourceText(dataResource, targetMimeTypeId, locale, templateContext,
>>>> delegator, cache), true, true); Map<String, ModelScreen> modelScreenMap =
>>>> ScreenFactory.readScreenDocument(screenXml, "DataResourceId: " + dataResource.getString("dataResourceId")); if
>>>> (UtilValidate.isNotEmpty(modelScreenMap)) { Map.Entry<String, ModelScreen> entry = modelScreenMap.entrySet().iterator().next();
>>>> // get first entry, only one screen allowed per file
>> I tested 9.04 it did not compile there. Then I tested 10.04, it compiled, I thought it should be done. Same for R11.04
>>
>> Jacques
>>
Re: svn commit: r1139755 - in /ofbiz/branches/release10.04: ./ applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
Posted by Scott Gray <sc...@hotwaxmedia.com>.
Bad reasons to justify a back port:
- It compiles
- It merges okay
- The junit tests pass
The only reasons to justify a back port:
- The bug has been reproduced
- A look at the code obviously shows that the bug exists
Things a committer should NEVER do:
- Commit code without understanding the problem or the solution
Every time you commit something that hasn't been properly verified as a fix you risk introducing instability to our release branches which is the exact opposite of what we are trying to achieve and the exact opposite of what our users expect from those branches.
Regards
Scott
On 27/06/2011, at 8:22 AM, Jacques Le Roux wrote:
> I tested 9.04 it did not compile, I did not apply. Then I tested 10.04, it compiled, I thought it should be done. Same for R11.04
>
> Jacques
>
> Scott Gray wrote:
>> This wasn't a bug in 10.04, I really don't like the idea of back porting any "fixes" without first verifying that it actually
>> needs to be done. Regards
>> Scott
>> On 26/06/2011, at 10:33 PM, jleroux@apache.org wrote:
>>> Author: jleroux
>>> Date: Sun Jun 26 10:33:25 2011
>>> New Revision: 1139755
>>> URL: http://svn.apache.org/viewvc?rev=1139755&view=rev
>>> Log:
>>> "Applied fix from trunk for revision: 1139504"
>>> ------------------------------------------------------------------------
>>> r1139504 | lektran | 2011-06-25 10:45:22 +0200 (sam., 25 juin 2011) | 1 line
>>> OFBIZ-4323 fix NPE bug reported by Javier Orrantia, screen xml documents rendered retrieved via the DataResourceWorker weren't
>>> using the correct UtilXml method that populates the xml documents userData.
>>> ------------------------------------------------------------------------
>>> Modified:
>>> ofbiz/branches/release10.04/ (props changed)
>>> ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
>>> Propchange: ofbiz/branches/release10.04/
>>> ------------------------------------------------------------------------------
>>> --- svn:mergeinfo (original)
>>> +++ svn:mergeinfo Sun Jun 26 10:33:25 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,943843,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,990
>>> 339,990539,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,1053722,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,107520
>>> 5,1075952,1076027,1076115,1080218,1080959,1083144,1084572,1084671,1084689,1084855,1085697,1085774,1090952,1090961,1090964,1092479,1094126,1096441,1098063,1104423,1131144,1132589,1132749,1134649,1134990,1135199,1135686,1137201,1137435,1139346,1139385
>>> +/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,943843,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,990
>>> 339,990539,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,1053722,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,107520
>>> 5,1075952,1076027,1076115,1080218,1080959,1083144,1084572,1084671,1084689,1084855,1085697,1085774,1090952,1090961,1090964,1092479,1094126,1096441,1098063,1104423,1131144,1132589,1132749,1134649,1134990,1135199,1135686,1137201,1137435,1139346,1139385,1139504
>>> 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=1139755&r1=1139754&r2=1139755&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 Sun Jun 26 10:33:25 2011 @@
>>> -716,7 +716,7 @@ public class DataResourceWorker impleme if
>>> ("URL_RESOURCE".equals(dataResource.getString("dataResourceTypeId")) &&
>>> UtilValidate.isNotEmpty(combinedName) && combinedName.startsWith("component://")) { modelScreen =
>>> ScreenFactory.getScreenFromLocation(combinedName); } else { // stored in a single file, long or short text - Document screenXml = UtilXml.readXmlDocument(getDataResourceText(dataResource, targetMimeTypeId, locale, templateContext,
>>> delegator, cache), true); + Document screenXml =
>>> UtilXml.readXmlDocument(getDataResourceText(dataResource, targetMimeTypeId, locale, templateContext,
>>> delegator, cache), true, true); Map<String, ModelScreen> modelScreenMap =
>>> ScreenFactory.readScreenDocument(screenXml, "DataResourceId: " + dataResource.getString("dataResourceId")); if
>>> (UtilValidate.isNotEmpty(modelScreenMap)) { Map.Entry<String, ModelScreen> entry = modelScreenMap.entrySet().iterator().next();
>>> // get first entry, only one screen allowed per file
>
> I tested 9.04 it did not compile there. Then I tested 10.04, it compiled, I thought it should be done. Same for R11.04
>
> Jacques
>
Re: svn commit: r1139755 - in /ofbiz/branches/release10.04: ./ applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
Posted by Jacques Le Roux <ja...@les7arts.com>.
I tested 9.04 it did not compile, I did not apply. Then I tested 10.04, it compiled, I thought it should be done. Same for R11.04
Jacques
Scott Gray wrote:
> This wasn't a bug in 10.04, I really don't like the idea of back porting any "fixes" without first verifying that it actually
> needs to be done.
>
> Regards
> Scott
>
> On 26/06/2011, at 10:33 PM, jleroux@apache.org wrote:
>
>> Author: jleroux
>> Date: Sun Jun 26 10:33:25 2011
>> New Revision: 1139755
>>
>> URL: http://svn.apache.org/viewvc?rev=1139755&view=rev
>> Log:
>> "Applied fix from trunk for revision: 1139504"
>> ------------------------------------------------------------------------
>> r1139504 | lektran | 2011-06-25 10:45:22 +0200 (sam., 25 juin 2011) | 1 line
>>
>> OFBIZ-4323 fix NPE bug reported by Javier Orrantia, screen xml documents rendered retrieved via the DataResourceWorker weren't
>> using the correct UtilXml method that populates the xml documents userData.
>> ------------------------------------------------------------------------
>>
>> Modified:
>> ofbiz/branches/release10.04/ (props changed)
>> ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
>>
>> Propchange: ofbiz/branches/release10.04/
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Sun Jun 26 10:33:25 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,943843,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,990
>> 339,990539,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,1053722,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,107520
>> 5,1075952,1076027,1076115,1080218,1080959,1083144,1084572,1084671,1084689,1084855,1085697,1085774,1090952,1090961,1090964,1092479,1094126,1096441,1098063,1104423,1131144,1132589,1132749,1134649,1134990,1135199,1135686,1137201,1137435,1139346,1139385
>> +/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,943843,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,990
>> 339,990539,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,1053722,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,107520
>> 5,1075952,1076027,1076115,1080218,1080959,1083144,1084572,1084671,1084689,1084855,1085697,1085774,1090952,1090961,1090964,1092479,1094126,1096441,1098063,1104423,1131144,1132589,1132749,1134649,1134990,1135199,1135686,1137201,1137435,1139346,1139385,1139504
>>
>> 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=1139755&r1=1139754&r2=1139755&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 Sun Jun 26 10:33:25 2011 @@
>> -716,7 +716,7 @@ public class DataResourceWorker impleme if
>> ("URL_RESOURCE".equals(dataResource.getString("dataResourceTypeId")) &&
>> UtilValidate.isNotEmpty(combinedName) && combinedName.startsWith("component://")) { modelScreen =
>> ScreenFactory.getScreenFromLocation(combinedName); } else { // stored in a single file, long or short text -
>> Document screenXml = UtilXml.readXmlDocument(getDataResourceText(dataResource, targetMimeTypeId, locale, templateContext,
>> delegator, cache), true); + Document screenXml =
>> UtilXml.readXmlDocument(getDataResourceText(dataResource, targetMimeTypeId, locale, templateContext,
>> delegator, cache), true, true); Map<String, ModelScreen> modelScreenMap =
>> ScreenFactory.readScreenDocument(screenXml, "DataResourceId: " + dataResource.getString("dataResourceId")); if
>> (UtilValidate.isNotEmpty(modelScreenMap)) { Map.Entry<String, ModelScreen> entry = modelScreenMap.entrySet().iterator().next();
>> // get first entry, only one screen allowed per file
I tested 9.04 it did not compile there. Then I tested 10.04, it compiled, I thought it should be done. Same for R11.04
Jacques