[Libreoffice-commits] core.git: binaryurp/source

[Stephan Bergmann]

 binaryurp/source/reader.cxx |   20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

New commits:
commit 70fe99d01944e51fd2a9d5eaf007bd3ee8967832
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 28 08:25:50 2013 +0100

    Minor simplification
    
    Change-Id: I031409043f12bdfe4b8c838d74db8a60576fd507

diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index 184f037..17a8863 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) {