summaryrefslogtreecommitdiff
path: root/binaryurp
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-08-15 11:37:34 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-08-15 11:37:34 +0200
commitedaf3e8cd146f5dadb73f1aebdf990f8a2656bc3 (patch)
tree811ddd3e0f4c30bf76fe87f55087b2dad87a742c /binaryurp
parentbc440c09ed6ff62759c40d7710286978e0be2169 (diff)
fdo#43433: Binary URP works gracefully with old Java URP
...which did not support protocol properties yet. Change-Id: Ic5bb346764fb039856e16169d5ae96d01422e7e0
Diffstat (limited to 'binaryurp')
-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 256cb91cf838..8e7d1d209f39 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -669,7 +669,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())));