flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Erik de Bruin <e...@ixsoftware.nl>
Subject Re: [1/2] git commit: [flex-sdk] [refs/heads/develop] - Fix for issue FLEX-34320
Date Mon, 09 Jun 2014 13:42:25 GMT
Bump...

EdB




On Thu, Jun 5, 2014 at 9:53 AM, Erik de Bruin <erik@ixsoftware.nl> wrote:

> -1 (binding)
>
> I'm vetoing this commit because it is causing the following (sets of)
> Mustella tests to fail:
>
> - LangPacks/Japanese/tests/runtimeErrorTests (aharui: "The new logic
> around setting the hasFieldName and hadPreviousFieldName changed and is no
> longer trigging the expected error which lets the code continue and trigger
> this new error.")
>
> - gumbo/core/DataGroup/events/DataGroup_Events_itemIndex (aharui: "It
> fails on line 395. You'll need a null check there.")
>
> It has been three weeks without a working solution (or 'fix' of the tests)
> and we need the successful Mustella runs because we're looking to get out a
> new release, so: please revert - or fix - this commit and all related ones.
>
> Thanks,
>
> EdB
>
>
>
>
>
> On Fri, May 16, 2014 at 1:08 AM, <labriola@apache.org> wrote:
>
>> Repository: flex-sdk
>> Updated Branches:
>>   refs/heads/develop be9633de1 -> 587354995
>>
>>
>> Fix for issue FLEX-34320
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/798194db
>> Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/798194db
>> Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/798194db
>>
>> Branch: refs/heads/develop
>> Commit: 798194db5eaf9aa28db4fd6027f78b40bb15800d
>> Parents: 3036b88
>> Author: Michael Labriola <labriola@digitalprimates.net>
>> Authored: Thu May 15 18:06:55 2014 -0500
>> Committer: Michael Labriola <labriola@digitalprimates.net>
>> Committed: Thu May 15 18:06:55 2014 -0500
>>
>> ----------------------------------------------------------------------
>>  .../framework/src/mx/collections/Sort.as        | 20 ++++++++++++--------
>>  1 file changed, 12 insertions(+), 8 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/798194db/frameworks/projects/framework/src/mx/collections/Sort.as
>> ----------------------------------------------------------------------
>> diff --git a/frameworks/projects/framework/src/mx/collections/Sort.as
>> b/frameworks/projects/framework/src/mx/collections/Sort.as
>> index a1c7333..609d1ea 100644
>> --- a/frameworks/projects/framework/src/mx/collections/Sort.as
>> +++ b/frameworks/projects/framework/src/mx/collections/Sort.as
>> @@ -392,23 +392,27 @@ public class Sort extends EventDispatcher
>> implements ISort
>>          {
>>              compareForFind = this.compareFunction;
>>              // configure the search criteria
>> -            if (values && fieldList.length > 0)
>> +                               if (values && fields.length > 0)
>>              {
>>                  fieldsForCompare = [];
>>                  //build up the fields we can compare, if we skip a field
>> in the
>>                  //middle throw an error.  it is ok to not have all the
>> fields
>>                  //though
>> -                var fieldName:String;
>> +                                       var field:ISortField;
>>                  var hadPreviousFieldName:Boolean = true;
>> -                for (var i:int = 0; i < fieldList.length; i++)
>> +                                       for (var i:int = 0; i <
>> fields.length; i++)
>>                  {
>> -                    fieldName = fieldList[i];
>> -                    if (fieldName)
>> +                                               field = fields[i];
>> +                                               if (field)
>>                      {
>>                          var hasFieldName:Boolean = false;
>>                                                 try
>>                          {
>> -                            hasFieldName = values[fieldName] !==
>> undefined;
>> +
>> hasFieldName = field.compareFunction != null;
>> +
>> +                                                               if (
>> !hasFieldName ) {
>> +
>> hasFieldName = values[field.name] !== undefined;
>> +                                                               }
>>                          }
>>                          catch(e:Error)
>>                          {
>> @@ -418,12 +422,12 @@ public class Sort extends EventDispatcher
>> implements ISort
>>                              if (!hadPreviousFieldName)
>>                              {
>>                                  message = resourceManager.getString(
>> -                                    "collections", "findCondition", [
>> fieldName ]);
>> +
>>       "collections", "findCondition", [ field.name ]);
>>                                  throw new SortError(message);
>>                              }
>>                              else
>>                              {
>> -                                fieldsForCompare.push(fieldName);
>> +
>> fieldsForCompare.push(field);
>>                              }
>>                          }
>>                          else
>>
>>
>
>
> --
> Ix Multimedia Software
>
> Jan Luykenstraat 27
> 3521 VB Utrecht
>
> T. 06-51952295
> I. www.ixsoftware.nl
>



-- 
Ix Multimedia Software

Jan Luykenstraat 27
3521 VB Utrecht

T. 06-51952295
I. www.ixsoftware.nl

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message