Kaydet (Commit) 01fb1701 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Related fdo#85190: Don't dress arbitrary Java Throwables as UNO Any values

Regression introduced with 9341bf3d "java: when
rethrowing, store the original exception," but these two appear to be the only
two cases related to com.sun.star.lang.WrappedTarget[Runtime]Exception in that
patch that would now create bad UNO Any values.  Happily reverted to the
original but oddly inconsistent setting of the WrappedTargetException's
TargetException member...

Change-Id: I9421da721d5a111d0d89ee0601238a2c01cfc12c
üst 7701b0cb
...@@ -216,12 +216,12 @@ public class SOReportJobFactory ...@@ -216,12 +216,12 @@ public class SOReportJobFactory
catch (java.lang.Exception e) catch (java.lang.Exception e)
{ {
LOGGER.error("ReportProcessing failed", e); LOGGER.error("ReportProcessing failed", e);
throw new com.sun.star.lang.WrappedTargetException(e.getMessage(), this, e); throw new com.sun.star.lang.WrappedTargetException(e, e.getMessage(), this, null);
} }
catch (java.lang.IncompatibleClassChangeError e2) catch (java.lang.IncompatibleClassChangeError e2)
{ {
LOGGER.error("Detected an IncompatibleClassChangeError"); LOGGER.error("Detected an IncompatibleClassChangeError");
throw new com.sun.star.lang.WrappedTargetException("caught a " + e2.getClass().getName(), this, e2); throw new com.sun.star.lang.WrappedTargetException(e2, "caught a " + e2.getClass().getName(), this, new com.sun.star.uno.Exception(e2.getLocalizedMessage()));
} }
Thread.currentThread().setContextClassLoader(cl); Thread.currentThread().setContextClassLoader(cl);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment