Merge pull request robbiehanson#172 from andrewtj/atj-fix-inverted-queue-asserts

robbiehanson · robbiehanson · commit 5bb556f5e7a3 · 2013-04-25T11:04:54.000-07:00
Fix inverted queue asserts
diff --git a/Extensions/CoreDataStorage/XMPPCoreDataStorage.m b/Extensions/CoreDataStorage/XMPPCoreDataStorage.m
@@ -765,7 +765,7 @@ - (void)executeBlock:(dispatch_block_t)block
 	// If you remove the assert statement below, you are destroying the sole purpose for this class,
 	// which is to optimize the disk IO by buffering save operations.
 	// 
-	NSAssert(dispatch_get_specific(storageQueueTag), @"Invoked on incorrect queue");
+	NSAssert(!dispatch_get_specific(storageQueueTag), @"Invoked on incorrect queue");
 	// 
 	// For a full discussion of this method, please see XMPPCoreDataStorageProtocol.h
 	//
@@ -795,7 +795,7 @@ - (void)scheduleBlock:(dispatch_block_t)block
 	// If you remove the assert statement below, you are destroying the sole purpose for this class,
 	// which is to optimize the disk IO by buffering save operations.
 	// 
-	NSAssert(dispatch_get_specific(storageQueueTag), @"Invoked on incorrect queue");
+	NSAssert(!dispatch_get_specific(storageQueueTag), @"Invoked on incorrect queue");
 	// 
 	// For a full discussion of this method, please see XMPPCoreDataStorageProtocol.h
 	// 
diff --git a/Extensions/Reconnect/XMPPReconnect.m b/Extensions/Reconnect/XMPPReconnect.m
@@ -525,7 +525,7 @@ - (void)maybeAttemptReconnectWithTicket:(int)ticket
 
 - (void)maybeAttemptReconnectWithReachabilityFlags:(SCNetworkReachabilityFlags)reachabilityFlags
 {
-	if (dispatch_get_specific(moduleQueueTag))
+	if (!dispatch_get_specific(moduleQueueTag))
 	{
 		dispatch_async(moduleQueue, ^{ @autoreleasepool {
 			
diff --git a/Extensions/XEP-0115/CoreDataStorage/XMPPCapabilitiesCoreDataStorage.m b/Extensions/XEP-0115/CoreDataStorage/XMPPCapabilitiesCoreDataStorage.m
@@ -220,7 +220,7 @@ - (NSXMLElement *)capabilitiesForJID:(XMPPJID *)jid xmppStream:(XMPPStream *)str
 - (NSXMLElement *)capabilitiesForJID:(XMPPJID *)jid ext:(NSString **)extPtr xmppStream:(XMPPStream *)stream
 {
 	// By design this method should not be invoked from the storageQueue.
-	NSAssert(dispatch_get_specific(storageQueueTag), @"Invoked on incorrect queue");
+	NSAssert(!dispatch_get_specific(storageQueueTag), @"Invoked on incorrect queue");
 	
 	XMPPLogTrace();
 	
@@ -331,7 +331,7 @@ - (BOOL)getCapabilitiesHash:(NSString **)hashPtr
                  xmppStream:(XMPPStream *)stream
 {
 	// By design this method should not be invoked from the storageQueue.
-	NSAssert(dispatch_get_specific(storageQueueTag), @"Invoked on incorrect queue");
+	NSAssert(!dispatch_get_specific(storageQueueTag), @"Invoked on incorrect queue");
 	
 	XMPPLogTrace();
 	
@@ -411,7 +411,7 @@ - (void)getCapabilitiesKnown:(BOOL *)areCapabilitiesKnownPtr
                   xmppStream:(XMPPStream *)stream
 {
 	// By design this method should not be invoked from the storageQueue.
-	NSAssert(dispatch_get_specific(storageQueueTag), @"Invoked on incorrect queue");
+	NSAssert(!dispatch_get_specific(storageQueueTag), @"Invoked on incorrect queue");
 	
 	XMPPLogTrace();
 	
@@ -519,7 +519,7 @@ - (void)setCapabilities:(NSXMLElement *)capabilities forHash:(NSString *)hash al
 - (void)setCapabilities:(NSXMLElement *)capabilities forJID:(XMPPJID *)jid xmppStream:(XMPPStream *)stream
 {
 	// By design this method should not be invoked from the storageQueue.
-	NSAssert(dispatch_get_specific(storageQueueTag), @"Invoked on incorrect queue");
+	NSAssert(!dispatch_get_specific(storageQueueTag), @"Invoked on incorrect queue");
 	
 	XMPPLogTrace();
 	

Original file line number	Diff line number	Diff line change
`@@ -525,7 +525,7 @@ - (void)maybeAttemptReconnectWithTicket:(int)ticket`
`525`	`525`
`526`	`526`	`- (void)maybeAttemptReconnectWithReachabilityFlags:(SCNetworkReachabilityFlags)reachabilityFlags`
`527`	`527`	`{`
`528`		`- if (dispatch_get_specific(moduleQueueTag))`
	`528`	`+ if (!dispatch_get_specific(moduleQueueTag))`
`529`	`529`	`{`
`530`	`530`	`dispatch_async(moduleQueue, ^{ @autoreleasepool {`
`531`	`531`