ObjFW  Diff

Differences From Artifact [4081c149ee]:

• File src/OFThread.m — part of check-in [ea96fd1e24] at 2010-04-10 21:29:39 on branch trunk — Greatly improve OFThread.
  This fixes a lot of issues that happened in the real world. (user: js, size: 4983) [annotate] [blame] [check-ins using]

To Artifact [12d687f3c9]:

• File src/OFThread.m — part of check-in [cc17787021] at 2010-04-10 21:43:47 on branch trunk — Minor fix for -[join] in OFThread.

  We also want to be able to join a thread that is still running, this
  change allows that. (user: js, size: 4978) [annotate] [blame] [check-ins using]

146
147
148
149
150
151
152
153
154
155
156
157
158
159
160

	[self retain];

	return self;
}

- (id)join
{
	if (running != OF_THREAD_WAITING_FOR_JOIN || !of_thread_join(thread))
		@throw [OFThreadJoinFailedException newWithClass: isa];

	running = OF_THREAD_NOT_RUNNING;

	return retval;
}

|

146
147
148
149
150
151
152
153
154
155
156
157
158
159
160

	[self retain];

	return self;
}

- (id)join
{
	if (running == OF_THREAD_NOT_RUNNING || !of_thread_join(thread))
		@throw [OFThreadJoinFailedException newWithClass: isa];

	running = OF_THREAD_NOT_RUNNING;

	return retval;
}