diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-11-28 08:25:50 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-11-28 08:26:02 +0100 |
| commit | 70fe99d01944e51fd2a9d5eaf007bd3ee8967832 (patch) | |
| tree | 59c16ee4703aaa4bb237200027c75dbd6e16ea35 /binaryurp | |
| parent | 492ec288f70089412d47e7b8c65c46e007ee1791 (diff) | |
Minor simplification
Change-Id: I031409043f12bdfe4b8c838d74db8a60576fd507
Diffstat (limited to 'binaryurp')
| -rw-r--r-- | binaryurp/source/reader.cxx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx index 184f037721b9..17a8863f6e12 100644 --- a/binaryurp/source/reader.cxx +++ b/binaryurp/source/reader.cxx @@ -230,20 +230,16 @@ void Reader::readMessage(Unmarshal & unmarshal) { *static_cast< uno_Interface ** >( unmarshal.readValue(t).getValue(t))); } - bool synchronous; - if (memberTd.get()->eTypeClass == typelib_TypeClass_INTERFACE_METHOD && + bool oneWay = + memberTd.get()->eTypeClass == typelib_TypeClass_INTERFACE_METHOD && (reinterpret_cast< typelib_InterfaceMethodTypeDescription * >( memberTd.get())-> - bOneWay)) - { - synchronous = forceSynchronous; - } else { - SAL_INFO_IF( - forceSynchronous, "binaryurp", - ("superfluous MUSTREPLY/SYNCHRONOUS ignored in request message with" - " non-oneway function ID")); - synchronous = true; - } + bOneWay); + SAL_INFO_IF( + !oneWay && forceSynchronous, "binaryurp", + ("superfluous MUSTREPLY/SYNCHRONOUS ignored in request message with" + " non-oneway function ID")); + bool synchronous = !oneWay || forceSynchronous; bool setter = false; std::vector< BinaryAny > inArgs; switch (memberTd.get()->eTypeClass) { |