Sorry David,
Yes, I had a doubt on this one. Anyway I have finished to treat waiting merges, and you will be quieter now that I will cease to
merging from trunk "old" commits. I tried to do my best, but I must say that it's not always easy. Most of the time I used comments
to decide myself and I must agree that it's not a good way to do it.
It's reverted in 578310
Thanks
Jacques
De : "David E Jones" <
[hidden email]>
>
> This breaks this script in the branch because the variable referred to only exists in the trunk. It was a bug fix in the trunk,
but a fix for a bug that ONLY existed in the trunk.
>
> This should be reverted, and in general: when it doubt, leave it out!
>
> -David
>
>
>
[hidden email] wrote:
> > Author: jleroux
> > Date: Fri Sep 21 14:06:32 2007
> > New Revision: 578275
> >
> > URL:
http://svn.apache.org/viewvc?rev=578275&view=rev> > Log:
> > Applied fix from trunk for revision: 572174
> >
> > Modified:
> > ofbiz/branches/release4.0/framework/webtools/webapp/webtools/WEB-INF/actions/service/availableservices.bsh
> >
> > Modified: ofbiz/branches/release4.0/framework/webtools/webapp/webtools/WEB-INF/actions/service/availableservices.bsh
> > URL:
> > ==============================================================================
> > --- ofbiz/branches/release4.0/framework/webtools/webapp/webtools/WEB-INF/actions/service/availableservices.bsh (original)
> > +++ ofbiz/branches/release4.0/framework/webtools/webapp/webtools/WEB-INF/actions/service/availableservices.bsh Fri Sep 21
14:06:32 2007
> > @@ -78,7 +78,7 @@
> > runOnFailure.setAccessible(false);
> >
> > //extract actions
> > - actions = curRuleClass.getDeclaredField("actions");
> > + actions = curRuleClass.getDeclaredField("actionsAndSets");
> > actions.setAccessible(true);
> > actionsVal = actions.get(curRule);
> > if(actionsVal != null){
> >
> >
>
Locked
