svn commit: r996076 - in /ofbiz/branches/release10.04: ./ applications/content/script/org/ofbiz/content/content/ContentServices.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r996076 - in /ofbiz/branches/release10.04: ./ applications/content/script/org/ofbiz/content/content/ContentServices.xml

jleroux@apache.org
Author: jleroux
Date: Sat Sep 11 05:46:56 2010
New Revision: 996076

URL: http://svn.apache.org/viewvc?rev=996076&view=rev
Log:
"Applied fix from trunk for revision: 996069"
------------------------------------------------------------------------
r996069 | lektran | 2010-09-11 07:24:12 +0200 (sam. 11 sept. 2010) | 1 ligne

Fix for OFBIZ-3832, adding a forum entry causes an illegal argument exception.  The problem was that one of the parameters passed to a Math.min(int, int) call was actually a String and the call-class-method doesn't attempt to convert arguments, it possibly should but I didn't change that here.
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/content/script/org/ofbiz/content/content/ContentServices.xml

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 11 05:46:56 2010
@@ -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,985473,985718,985856,985902,987841,989166,990127,990339,990539,991
 485,993344,993387,995384,995686
+/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,985473,985718,985856,985902,987841,989166,990127,990339,990539,991
 485,993344,993387,995384,995686,996069

Modified: ofbiz/branches/release10.04/applications/content/script/org/ofbiz/content/content/ContentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=996076&r1=996075&r2=996076&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original)
+++ ofbiz/branches/release10.04/applications/content/script/org/ofbiz/content/content/ContentServices.xml Sat Sep 11 05:46:56 2010
@@ -979,6 +979,7 @@
         <call-object-method method-name="length" obj-field="parameters.textData" ret-field="textDataLen"/>
         <log level="info" message="textDataLen:${textDataLen}"/>
         <property-to-field resource="forum" property="descriptLen" field="descriptLen"/>
+        <set field="descriptLen" from-field="descriptLen" type="Integer"/>
         <log level="info" message="descriptLen:${descriptLen}"/>
         <call-class-method method-name="min" class-name="java.lang.Math" ret-field="subStringLen">
             <field field="textDataLen" type="int"/>