[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-4' - binaryurp/source

[Stephan Bergmann]

 binaryurp/source/reader.cxx |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit c17453ed05aeef42e2e16c4df5f48e1a757d109f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 27 14:49:22 2013 +0100

    binaryurp: silently ignore superfluous MUSTREPLY/SYNCHRONOUS flags
    
    ...in a non-oneway call.  This can happen when a pre LO 4 entity is calling a
    LO 4 entity post 90eac3e69749a9227c4b6902b1f3cef1e338c6d1
    "API CHANGE remove [oneway] method attributes."  (See mail thread starting at
    <http://mail-archives.apache.org/mod_mbox/openoffice-api/201311.mbox/%3Ca4e7f34d-b8cb-4d5a-890f-6894d3410265%40ucimail2.uci.cu%3E>
    "hi, code in Java.")
    
    Change-Id: I9f800a979d84a95cc5cd96f75ee7472e8cf6cf4b
    (cherry picked from commit 289e54feabc936b8175327355a159073830a326a)
    Reviewed-on: https://gerrit.libreoffice.org/6835
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index 522b165..184f037 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -238,12 +238,10 @@ void Reader::readMessage(Unmarshal & unmarshal) {
     {
         synchronous = forceSynchronous;
     } else {
-        if (forceSynchronous) {
-            throw css::uno::RuntimeException(
-                ("URP: synchronous request message with non-oneway function ID"
-                 " received"),
-                css::uno::Reference< css::uno::XInterface >());
-        }
+        SAL_INFO_IF(
+            forceSynchronous, "binaryurp",
+            ("superfluous MUSTREPLY/SYNCHRONOUS ignored in request message with"
+             " non-oneway function ID"));
         synchronous = true;
     }
     bool setter = false;