summaryrefslogtreecommitdiff
path: root/swift/src/IceObjc/ObjectAdapter.mm
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2019-05-07 14:05:05 -0400
committerJoe George <joe@zeroc.com>2019-05-07 14:05:05 -0400
commit22dc88b4ab9bcd4a2763fad61f38bb834b0ceb35 (patch)
treebfb5864b02158d1efc838f5d56facb65243fc555 /swift/src/IceObjc/ObjectAdapter.mm
parentDispatch queue updates (diff)
downloadice-22dc88b4ab9bcd4a2763fad61f38bb834b0ceb35.tar.bz2
ice-22dc88b4ab9bcd4a2763fad61f38bb834b0ceb35.tar.xz
ice-22dc88b4ab9bcd4a2763fad61f38bb834b0ceb35.zip
More dispatch queue fixes
Diffstat (limited to 'swift/src/IceObjc/ObjectAdapter.mm')
-rw-r--r--swift/src/IceObjc/ObjectAdapter.mm12
1 files changed, 10 insertions, 2 deletions
diff --git a/swift/src/IceObjc/ObjectAdapter.mm b/swift/src/IceObjc/ObjectAdapter.mm
index 7268996c0b5..d2a5dfec592 100644
--- a/swift/src/IceObjc/ObjectAdapter.mm
+++ b/swift/src/IceObjc/ObjectAdapter.mm
@@ -204,9 +204,17 @@
}
}
--(dispatch_queue_t) getDispatchQueue
+-(dispatch_queue_t) getDispatchQueue:(NSError* _Nullable * _Nullable)error
{
- return self.objectAdapter->getDispatchQueue();
+ try
+ {
+ return self.objectAdapter->getDispatchQueue();
+ }
+ catch(const std::exception& ex)
+ {
+ *error = convertException(ex);
+ return nil;
+ }
}
-(void) registerDefaultServant:(id<ICEBlobjectFacade>)facade