Explicitly return an error when waitForTicket: exits its loop without…

… the callback having been invoked git-svn-id: http://gdata-objectivec-client.googlecode.com/svn/trunk@715 f334b912-182a-0410-b59a-f50d4d03ee1a
nparry · Dec 27, 2011 · 56ea3ea · 56ea3ea
1 parent 2092519
commit 56ea3ea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/Source/BaseClasses/GDataServiceBase.h b/Source/BaseClasses/GDataServiceBase.h
@@ -60,6 +60,7 @@ _EXTERN NSString* const kGDataServiceTicketParsingStoppedNotification _INITIALIZ
 
 enum {
   kGDataCouldNotConstructObjectError = -100,
+  kGDataWaitTimedOutError            = -101
 };
 
 @class GDataServiceTicketBase;

diff --git a/Source/BaseClasses/GDataServiceBase.m b/Source/BaseClasses/GDataServiceBase.m
@@ -1307,6 +1307,12 @@ - (BOOL)waitForTicket:(GDataServiceTicketBase *)ticket
 
   NSError *fetchError = [ticket fetchError];
 
+  if (![ticket hasCalledCallback] && fetchError == nil) {
+    fetchError = [NSError errorWithDomain:kGDataServiceErrorDomain
+                                     code:kGDataWaitTimedOutError
+                                 userInfo:nil];
+  }
+
   if (outObjectOrNil) *outObjectOrNil = [ticket fetchedObject];
   if (outErrorOrNil)  *outErrorOrNil = fetchError;