ObjXMPP  Check-in [8bc32c2743]

Overview
Comment:Fix up -[XMPPJID isEqual:] and -[XMPPJID hash]
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 8bc32c27436d767ef716cf5967541123cd4f760141b8d97a41d0095f9455246f
User & Date: florob@babelmonkeys.de on 2013-03-03 16:30:58
Other Links: manifest | tags
Context
2013-03-23
17:21
Add classes to support Service Discovery check-in: db8adef472 user: florob@babelmonkeys.de tags: trunk
2013-03-03
16:30
Fix up -[XMPPJID isEqual:] and -[XMPPJID hash] check-in: 8bc32c2743 user: florob@babelmonkeys.de tags: trunk
2013-02-23
13:49
Rename XMPPJSONFileStorage to XMPPFileStorage. check-in: c9bb52e823 user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified src/XMPPJID.m from [2b87940ac6] to [ced62b3025].

︙
237
238
239
240
241
242
243


244
245



246
247
248
249
250
251
252










253

254
255

237
238
239
240
241
242
243
244
245


246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265

266
267
268








+
+
-
-
+
+
+







+
+
+
+
+
+
+
+
+
+
-
+



		return YES;

	if (![object isKindOfClass: [XMPPJID class]])
		return NO;

	JID = object;

	// Node and resource may be nil
	if ((_node == JID->_node || [_node isEqual: JID->_node]) &&
	if ([_node isEqual: JID->_node] && [_domain isEqual: JID->_domain] &&
	    [_resource isEqual: JID->_resource])
	    [_domain isEqual: JID->_domain] &&
	    (_resource == JID->_resource || [_resource isEqual: JID->_resource])
	   )
		return YES;

	return NO;
}

- (uint32_t) hash
{
	uint32_t hash;

	OF_HASH_INIT(hash);

	OF_HASH_ADD_HASH(hash, [_node hash]);
	OF_HASH_ADD_HASH(hash, [_domain hash]);
	OF_HASH_ADD_HASH(hash, [_resource hash]);

	OF_HASH_FINALIZE(hash);

	return [[self fullJID] hash];
	return hash;
}
@end