You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2008/08/25 21:58:12 UTC
svn commit: r688854 -
/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy
Author: lektran
Date: Mon Aug 25 12:58:12 2008
New Revision: 688854
URL: http://svn.apache.org/viewvc?rev=688854&view=rev
Log:
Another groovy fix, this is actually more of a problem with the ModelService class which implements the Map interface but when groovy tries to determine the size of the map, the entrySet() call unexpectedly returns null
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy?rev=688854&r1=688853&r2=688854&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy Mon Aug 25 12:58:12 2008
@@ -482,7 +482,7 @@
curServiceModel = curDispatchContext.getModelService(serviceName);
canIncludeService = true;
- if (constraint && curServiceModel) {
+ if (constraint && curServiceModel != null) {
consArr = constraint.split("@");
constraintName = consArr[0];
constraintVal = consArr[1];
Re: svn commit: r688854 - /ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy
Posted by "David E. Jones" <jo...@hotwaxmedia.com>.
Adam Heath wrote:
> lektran@apache.org wrote:
>> Author: lektran
>> Date: Mon Aug 25 12:58:12 2008
>> New Revision: 688854
>>
>> URL: http://svn.apache.org/viewvc?rev=688854&view=rev
>> Log:
>> Another groovy fix, this is actually more of a problem with the
>> ModelService class which implements the Map interface but when groovy
>> tries to determine the size of the map, the entrySet() call
>> unexpectedly returns null
>
> I've got a slightly different 'fix' for this. I needed proper
> implementation of hashCode() and equals(); they also failed when
> entrySet() returned null.
>
> So, I implemented entrySet() properly. But haven't yet checked it in.
I like that idea, ie fix it in the more central place so we don't run into this again.
-David
Re: svn commit: r688854 - /ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy
Posted by Adam Heath <do...@brainfood.com>.
lektran@apache.org wrote:
> Author: lektran
> Date: Mon Aug 25 12:58:12 2008
> New Revision: 688854
>
> URL: http://svn.apache.org/viewvc?rev=688854&view=rev
> Log:
> Another groovy fix, this is actually more of a problem with the ModelService class which implements the Map interface but when groovy tries to determine the size of the map, the entrySet() call unexpectedly returns null
I've got a slightly different 'fix' for this. I needed proper
implementation of hashCode() and equals(); they also failed when
entrySet() returned null.
So, I implemented entrySet() properly. But haven't yet checked it in.
>
> Modified:
> ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy
>
> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy?rev=688854&r1=688853&r2=688854&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy (original)
> +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy Mon Aug 25 12:58:12 2008
> @@ -482,7 +482,7 @@
> curServiceModel = curDispatchContext.getModelService(serviceName);
>
> canIncludeService = true;
> - if (constraint && curServiceModel) {
> + if (constraint && curServiceModel != null) {
> consArr = constraint.split("@");
> constraintName = consArr[0];
> constraintVal = consArr[1];
>
>