From 3a51daeace695ead38cfd82b3a0f1e6f25a32e0f Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 24 May 2018 15:47:30 +0200
Subject: Improve re-throwing of UNO exceptions

(*) if we are already throwing a Wrapped*Exception, get the
exception using cppu::getCaughtexception.

(*) when catching and then immediately throwing UNO exceptions,
use cppu::getCaughtException to prevent exception slicing

(*) if we are going to catch an exception and then
immediately throw a RuntimeException, rather throw a
WrappedTargetRuntimeException and preserve the original exception information.

Change-Id: Ia7a501a50ae0e6f4d05186333c8517fdcb17d558
Reviewed-on: https://gerrit.libreoffice.org/54692
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 jvmaccess/source/classpath.cxx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'jvmaccess/source')

diff --git a/jvmaccess/source/classpath.cxx b/jvmaccess/source/classpath.cxx
index 4be1fedb7d26..c1a0d165f397 100644
--- a/jvmaccess/source/classpath.cxx
+++ b/jvmaccess/source/classpath.cxx
@@ -25,6 +25,7 @@
 #include <vector>
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -32,6 +33,7 @@
 #include <com/sun/star/uri/UriReferenceFactory.hpp>
 #include <com/sun/star/uri/XVndSunStarExpandUrlReference.hpp>
 #include <com/sun/star/util/theMacroExpander.hpp>
+#include <cppuhelper/exc_hlp.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
@@ -66,9 +68,11 @@ jobjectArray jvmaccess::ClassPath::translateToUrls(
                 try {
                     url = expUrl->expand( expander );
                 } catch (const css::lang::IllegalArgumentException & e) {
-                    throw css::uno::RuntimeException(
+                    css::uno::Any anyEx = cppu::getCaughtException();
+                    throw css::lang::WrappedTargetRuntimeException(
                         "com.sun.star.lang.IllegalArgumentException: "
-                         + e.Message);
+                         + e.Message,
+                         nullptr, anyEx );
                 }
             }
             jvalue arg;
-- 
cgit