diff --git a/Foundation/CPArray/CPMutableArray.j b/Foundation/CPArray/CPMutableArray.j index 58f978f6d..e15ccb138 100644 --- a/Foundation/CPArray/CPMutableArray.j +++ b/Foundation/CPArray/CPMutableArray.j @@ -530,9 +530,7 @@ var sortArrayUsingJSDescriptors = function(a, d) if (value1 === nil || value1 === cpNull) o = value2 === nil || value2 === cpNull ? CPOrderedSame : CPOrderedAscending; else - { o = value2 === nil || value2 === cpNull ? CPOrderedDescending : objj_msgSend(value1, dd.s, value2); - } if (o && !dd.a) o = -o; diff --git a/Foundation/CPString.j b/Foundation/CPString.j index 4e7f7996b..b5e076a2d 100644 --- a/Foundation/CPString.j +++ b/Foundation/CPString.j @@ -508,9 +508,11 @@ var CPStringNull = [CPNull null]; */ - (CPComparisonResult)compare:(CPString)aString options:(int)aMask { - if (aString === nil) return CPOrderedDescending; + if (aString === nil) + return CPOrderedDescending; - if (aString === CPStringNull) [CPException raise:CPInvalidArgumentException reason:"compare: argument can't be 'CPNull'"]; + if (aString === CPStringNull) + [CPException raise:CPInvalidArgumentException reason:"compare: argument can't be 'CPNull'"]; var lhs = self, rhs = aString;