summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-08-15 11:37:34 +0200
committerMichael Stahl <mstahl@redhat.com>2012-08-15 12:20:07 +0200
commitd6a1b16de3df06a798d1e728219090810e6c1ebe (patch)
tree352b74e717fdf4ca798c7bfffef7e84aa8cff244
parent53d64c71d3a4fcc6b238e946fd6883b8b4593bca (diff)
fdo#43433: Binary URP works gracefully with old Java URP
...which did not support protocol properties yet. Change-Id: Ic5bb346764fb039856e16169d5ae96d01422e7e0 Signed-off-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--binaryurp/source/bridge.cxx19
1 files changed, 18 insertions, 1 deletions
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 13987fe3bd51..af7118954808 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -677,7 +677,24 @@ void Bridge::sendRequestChangeRequest() {
void Bridge::handleRequestChangeReply(
bool exception, BinaryAny const & returnValue)
{
- throwException(exception, returnValue);
+ try {
+ throwException(exception, returnValue);
+ } catch (css::uno::RuntimeException & e) {
+ // Before OOo 2.2, Java URP would throw a RuntimeException when
+ // receiving a requestChange message (see i#35277 "Java URP: Support
+ // Manipulation of Protocol Properties"):
+ if (mode_ != MODE_REQUESTED) {
+ throw;
+ }
+ SAL_WARN(
+ "binaryurp",
+ "requestChange caught RuntimeException \'" << e.Message
+ << "' in state 'requested'");
+ mode_ = MODE_NORMAL;
+ getWriter()->unblock();
+ decrementCalls();
+ return;
+ }
sal_Int32 n = *static_cast< sal_Int32 * >(
returnValue.getValue(
css::uno::TypeDescription(cppu::UnoType< sal_Int32 >::get())));