diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-10 20:18:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-10 20:18:36 +0000 |
| commit | 52cd737df4e220291185d1145e4c124d93c39664 (patch) | |
| tree | 71dfd070c26ff12d1cb196ba318bd077469303ee | |
| parent | 927fd8b0e1e7c323fcb65a7bb1d2566828a10e6b (diff) | |
| parent | 421e5cb2b4a3f1b5a8db58543b9cd96df62e9599 (diff) | |
| download | nova-52cd737df4e220291185d1145e4c124d93c39664.tar.gz nova-52cd737df4e220291185d1145e4c124d93c39664.tar.xz nova-52cd737df4e220291185d1145e4c124d93c39664.zip | |
Merge "Bug #894683: nova.service does not handle attribute specific exceptions and client hangs"
| -rw-r--r-- | nova/rpc/impl_kombu.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/rpc/impl_kombu.py b/nova/rpc/impl_kombu.py index 82eb651de..9ed1e4e6f 100644 --- a/nova/rpc/impl_kombu.py +++ b/nova/rpc/impl_kombu.py @@ -642,10 +642,10 @@ class ProxyCallback(object): object and calls it. """ - node_func = getattr(self.proxy, str(method)) - node_args = dict((str(k), v) for k, v in args.iteritems()) - # NOTE(vish): magic is fun! try: + node_func = getattr(self.proxy, str(method)) + node_args = dict((str(k), v) for k, v in args.iteritems()) + # NOTE(vish): magic is fun! rval = node_func(context=ctxt, **node_args) # Check if the result was a generator if inspect.isgenerator(rval): |