Merge pull request #27 in BPHVB/mvm_core from release/6_5 to develop

* commit '6f08c4d56eb4e6eb3037a4e5a392ef03417a743b':
  hot fix for session being nil, causing operation to hang forever. Will change to logging error once we fix the session restart foreground race condition. Crash catch for carousel when no feed cards are found. Will not look right, but can't afford the crash in case of race condition that is still live with session clearing. Fix push feed leak
This commit is contained in:
Sommer, Patrick 2018-08-01 10:40:54 -04:00
commit 3cec2459b0

View File

@ -310,8 +310,15 @@
}
return nil;
}
NSURLSession *session = [MVMCoreSessionObject sharedGlobal].session;
if (!session) {
#warning Hotfix for when session is nil. We should switch to logging these errors once we fix how session handler misses canceling certain calls because they happen at the same time.
error = [[MVMCoreErrorObject alloc] initWithTitle:[MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorTitle] message:[MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorCritical] messageToLog:nil code:ErrorCodeDefault domain:ErrorDomainNative location:locationForError];
error.logError = NO;
requestFinished(nil,error);
}
if ([[MFFreebeeHandler sharedHandler] isFreeBeeEnabled]
&& [[MFFreebeeHandler sharedHandler] isValidCampaign]) {
BOOL isAllowedPage = [[MFFreebeeHandler sharedHandler] isAllowedPage:requestParameters.pageType];