Fix crash in converting JSON string that included non-ASCII characters. Now assume UTF-8

SVN: 27458

openbis-ipad/BisKit/Classes/CISDOBIpadEntity.m

@@ -25,11 +25,17 @@
 #import "CISDOBIpadService.h"
 
 ///! Convert a JSON string to objects. Returns nil if the string is nil.
-id ObjectFromJsonData(NSString *jsonData, NSError **error)
+id ObjectFromJsonData(NSString *jsonDataString, NSError **error)
 {
-    if (nil == jsonData) return nil;
+    if (nil == jsonDataString) return nil;
+    NSData *jsonData = [jsonDataString dataUsingEncoding: NSUTF8StringEncoding];
+    if (!jsonData) {
+        NSLog(@"Could not convert json string (%@) to UTF-8", jsonDataString);
+        // Do not treat this as an error -- just log it
+        return nil;
+    }
 
-    return [NSJSONSerialization JSONObjectWithData: [jsonData dataUsingEncoding: NSASCIIStringEncoding] options: 0 error: error];
+    return [NSJSONSerialization JSONObjectWithData: jsonData options: 0 error: error];
 }