From 4da5c940ab124fc39b10908f798f3ad19630ccde Mon Sep 17 00:00:00 2001 From: Richard Frith-MacDonald Date: Wed, 14 Apr 2010 10:39:05 +0000 Subject: [PATCH] revert reversion ... i was wrong about jigs git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@30150 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 4 ---- Source/NSArray.m | 10 +++------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index cde5e095f..81db8a770 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,3 @@ -2010-04-14 Richard Frith-Macdonald - - * Revert last change ... it broke the method for use in jigs. - 2010-04-13 Richard Frith-Macdonald * Source/NSArray.m: ([-initWithContentsOfFile:]) added ugly OSX diff --git a/Source/NSArray.m b/Source/NSArray.m index de8d4f31f..72dc664e4 100644 --- a/Source/NSArray.m +++ b/Source/NSArray.m @@ -796,16 +796,12 @@ static SEL rlSel; RELEASE(myString); if ([result isKindOfClass: NSArrayClass]) { + //self = [self initWithArray: result]; /* OSX appears to always return a mutable array rather than * the class of the receiver. - * GNUstep behavior is to initialize the receiver with the - * contents of the array in the property list ... which seems - * much more sane, and importantly means that the jigs java - * bridge can work with this method (the java bridge has - * problems with initialisers which return a result other - * than the original receiver). */ - self = [self initWithArray: result]; + RELEASE(self); + self = RETAIN(result); } else {