BIS-159 SP-395 : Workaround strange deadlock in accessing URLs. Seems to be...

BIS-159 SP-395 : Workaround strange deadlock in accessing URLs. Seems to be restricted to the simulator. SVN: 27832

BIS-159 SP-395 : Workaround strange deadlock in accessing URLs. Seems to be...
ad8a983e · cramakri · 94ca4b34 · ad8a983e · ad8a983e · ad8a983e
Commit ad8a983e authored 12 years ago by cramakri
--- a/openbis-ipad/Research/BisMac.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/openbis-ipad/Research/BisMac.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate
--- a/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/openbis-ipad/openBIS/openBIS.xcodeproj/project.xcworkspace/xcuserdata/cramakri.xcuserdatad/UserInterfaceState.xcuserstate
--- a/openbis-ipad/openBIS/openBIS/CISDOBAppDelegate.m
+++ b/openbis-ipad/openBIS/openBIS/CISDOBAppDelegate.m
@@ -142,8 +142,14 @@
    [call start];
 }

+// There is a deadlock that happens initializing the cookie storage, so do it now before
+// multiple threads are running. This might only be a problem in the simulator...
+- (void)cookieStorageDeadlockWorkaround { [NSHTTPCookieStorage sharedHTTPCookieStorage]; }
+
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+    [self cookieStorageDeadlockWorkaround];
+    
    // Initialize the controller
    [self configureControllers];
    

--- a/openbis-ipad/openBIS/openBIS/openBIS-Info.plist
+++ b/openbis-ipad/openBIS/openBIS/openBIS-Info.plist
@@ -40,7 +40,7 @@
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIMainStoryboardFile</key>
-	<string>MainStoryboard_iPad</string>
+	<string>MainStoryboard_iPhone</string>
 	<key>UIMainStoryboardFile~ipad</key>
 	<string>MainStoryboard_iPad</string>
 	<key>UIPrerenderedIcon</key>