java: when rethrowing, store the original exception

Change-Id: I14666493e72da177fcfff1895ef3206f0e13cc01

10 files changed, 88 insertions, 74 deletions

diff --git a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
index b9df352d56e4..92f5ee777f97 100644
--- a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
+++ b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java
@@ -165,7 +165,7 @@ public class SecurityDialog extends WeakBase implements
             try {
                 checkBoxPath = AnyConverter.toString(args[0]);
             } catch (IllegalArgumentException e) {
-                throw new RuntimeException("SecurityDialog::initialize: " + e.getMessage());
+                throw new RuntimeException(e);
             }
 
             LogUtils.DEBUG("path: " + checkBoxPath);
@@ -189,13 +189,9 @@ public class SecurityDialog extends WeakBase implements
         try {
             _xDialog = createDialog();
         } catch (com.sun.star.uno.Exception e) {
-            LogUtils.DEBUG("Couldn't create dialog");
-            LogUtils.DEBUG("uno message: " + e.getMessage());
-            throw new RuntimeException(e.getMessage());
+            throw new RuntimeException(e);
         } catch (Exception e) {
-            LogUtils.DEBUG("Couldn't create dialog");
-            LogUtils.DEBUG("message: " + e.getMessage());
-            throw new RuntimeException(e.getMessage());
+            throw new RuntimeException(e);
         }
 
     }
diff --git a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
index e816f8e6dbd0..fe2efd939899 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
@@ -185,16 +185,12 @@ public class ScriptBrowseNode extends PropertySet implements
             try {
                 data = (ScriptMetaData)parent.getByName(name);
             } catch (NoSuchElementException nse) {
-
-                throw new com.sun.star.lang.IllegalArgumentException(
+                throw new com.sun.star.lang.IllegalArgumentException(nse,
                     name + " does not exist or can't be found ");
-
             } catch (com.sun.star.lang.WrappedTargetException wte) {
-
                 // rethrow
                 throw new InvocationTargetException(
                     "Scripting framework editing script ", null, wte.TargetException);
-
             }
 
             provider.getScriptEditor().edit(ctxt, data);
@@ -212,16 +208,12 @@ public class ScriptBrowseNode extends PropertySet implements
                 parent.removeByName(name);
                 result = new Any(new Type(Boolean.class), Boolean.TRUE);
             } catch (NoSuchElementException nse) {
-
-                throw new com.sun.star.lang.IllegalArgumentException(
+                throw new com.sun.star.lang.IllegalArgumentException(nse,
                     name + " does not exist or can't be found ");
-
             } catch (WrappedTargetException wte) {
-
                 // rethrow
                 throw new InvocationTargetException(
                     "Scripting framework deleting script ", null, wte.TargetException);
-
             }
 
         } else if (aFunctionName.equals("Renamable")) {
@@ -263,28 +255,20 @@ public class ScriptBrowseNode extends PropertySet implements
                 name = languageName;
                 result = new Any(new Type(XBrowseNode.class), this);
             } catch (NoSuchElementException nse) {
-
-                throw new com.sun.star.lang.IllegalArgumentException(
+                throw new com.sun.star.lang.IllegalArgumentException(nse,
                     name + " does not exist or can't be found ");
-
             } catch (ElementExistException eee) {
-
                 // rethrow
                 throw new InvocationTargetException(
                     "Scripting framework error renaming script ", null, eee);
-
             } catch (WrappedTargetException wte) {
-
                 // rethrow
                 throw new InvocationTargetException(
                     "Scripting framework rename script ", null, wte.TargetException);
-
             }
         } else {
-
             throw new com.sun.star.lang.IllegalArgumentException(
                 "Function " + aFunctionName + " not supported.");
-
         }
 
         return result;
diff --git a/scripting/java/com/sun/star/script/framework/container/Parcel.java b/scripting/java/com/sun/star/script/framework/container/Parcel.java
index 0c9d41d60ae8..df94463bb1eb 100644
--- a/scripting/java/com/sun/star/script/framework/container/Parcel.java
+++ b/scripting/java/com/sun/star/script/framework/container/Parcel.java
@@ -175,8 +175,8 @@ public class Parcel implements XNameContainer {
 
             }
             // TO DO should catch specified exceptions
-            catch (Exception e) {
-                throw new com.sun.star.lang.WrappedTargetException();
+            catch (Exception ex) {
+                throw new com.sun.star.lang.WrappedTargetException(ex);
             }
 
         }
diff --git a/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java b/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java
index 45b10e9df3df..0e25745a1b38 100644
--- a/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java
+++ b/scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java
@@ -73,12 +73,18 @@ public class XMLParserFactory {
                 }
 
                 result = builder.parse(is);
-            } catch (SAXParseException spe) {
-                throw new IOException(spe.getMessage());
-            } catch (SAXException se) {
-                throw new IOException(se.getMessage());
-            } catch (ParserConfigurationException pce) {
-                throw new IOException(pce.getMessage());
+            } catch (SAXParseException ex1) {
+                IOException ex2 = new IOException();
+                ex2.initCause(ex1);
+                throw ex2;
+            } catch (SAXException ex1) {
+                IOException ex2 = new IOException();
+                ex2.initCause(ex1);
+                throw ex2;
+            } catch (ParserConfigurationException ex1) {
+                IOException ex2 = new IOException();
+                ex2.initCause(ex1);
+                throw ex2;
             }
 
             return result;
@@ -169,12 +175,18 @@ public class XMLParserFactory {
 
                     method.invoke(impl, new Object[] {doc});
                 }
-            } catch (NoSuchMethodException ex) {
-                throw new IOException(ex.getMessage());
-            } catch (ClassNotFoundException ex) {
-                throw new IOException(ex.getMessage());
-            } catch (Exception ex) {
-                throw new IOException(ex.getMessage());
+            } catch (NoSuchMethodException ex1) {
+                IOException ex2 = new IOException();
+                ex2.initCause(ex1);
+                throw ex2;
+            } catch (ClassNotFoundException ex1) {
+                IOException ex2 = new IOException();
+                ex2.initCause(ex1);
+                throw ex2;
+            } catch (Exception ex1) {
+                IOException ex2 = new IOException();
+                ex2.initCause(ex1);
+                throw ex2;
             }
         }
     }
diff --git a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
index 79f933cdeae4..3c27b0367d38 100644
--- a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
+++ b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
@@ -255,12 +255,14 @@ public class UCBStreamHandler extends URLStreamHandler {
             }
 
             result = new ByteArrayInputStream(inputBytes[0]);
-        } catch (com.sun.star.io.IOException ioe) {
-            LogUtils.DEBUG("caught exception " + ioe);
-            throw new IOException(ioe.getMessage());
-        } catch (com.sun.star.uno.Exception e) {
-            LogUtils.DEBUG("caught exception " + e);
-            throw new IOException(e.getMessage());
+        } catch (com.sun.star.io.IOException ex1) {
+            IOException ex2 = new IOException();
+            ex2.initCause(ex1);
+            throw ex2;
+        } catch (com.sun.star.uno.Exception ex1) {
+            IOException ex2 = new IOException();
+            ex2.initCause(ex1);
+            throw ex2;
         } finally {
             if (xInputStream != null) {
                 try {
diff --git a/scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java b/scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java
index 402c1582ee45..10cb1db52888 100644
--- a/scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java
+++ b/scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java
@@ -19,6 +19,7 @@ package com.sun.star.script.framework.io;
 
 import com.sun.star.io.XInputStream;
 
+import java.io.IOException;
 import java.io.InputStream;
 
 public class XInputStreamWrapper extends InputStream {
@@ -36,8 +37,10 @@ public class XInputStreamWrapper extends InputStream {
 
         try {
             numRead = m_xInputStream.readBytes(byteRet, 1);
-        } catch (com.sun.star.io.IOException ioe) {
-            throw new java.io.IOException(ioe.getMessage());
+        } catch (com.sun.star.io.IOException ex1) {
+            IOException ex2 = new IOException();
+            ex2.initCause(ex1);
+            throw ex2;
         }
 
         if (numRead != 1) {
@@ -54,8 +57,10 @@ public class XInputStreamWrapper extends InputStream {
 
         try {
             return m_xInputStream.readBytes(byteRet, b.length);
-        } catch (com.sun.star.io.IOException ioe) {
-            throw new java.io.IOException(ioe.getMessage());
+        } catch (com.sun.star.io.IOException ex1) {
+            IOException ex2 = new IOException();
+            ex2.initCause(ex1);
+            throw ex2;
         }
     }
 
@@ -64,8 +69,10 @@ public class XInputStreamWrapper extends InputStream {
         try {
             m_xInputStream.skipBytes((int)n);
             return n;
-        } catch (com.sun.star.io.IOException ioe) {
-            throw new java.io.IOException(ioe.getMessage());
+        } catch (com.sun.star.io.IOException ex1) {
+            IOException ex2 = new IOException();
+            ex2.initCause(ex1);
+            throw ex2;
         }
     }
 
@@ -73,8 +80,10 @@ public class XInputStreamWrapper extends InputStream {
     public int available() throws java.io.IOException {
         try {
             return m_xInputStream.available();
-        } catch (com.sun.star.io.IOException ioe) {
-            throw new java.io.IOException(ioe.getMessage());
+        } catch (com.sun.star.io.IOException ex1) {
+            IOException ex2 = new IOException();
+            ex2.initCause(ex1);
+            throw ex2;
         }
     }
 
@@ -82,8 +91,10 @@ public class XInputStreamWrapper extends InputStream {
     public void close() throws java.io.IOException {
         try {
             m_xInputStream.closeInput();
-        } catch (com.sun.star.io.IOException ioe) {
-            throw new java.io.IOException(ioe.getMessage());
+        } catch (com.sun.star.io.IOException ex1) {
+            IOException ex2 = new IOException();
+            ex2.initCause(ex1);
+            throw ex2;
         }
     }
 }
\ No newline at end of file
diff --git a/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java b/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
index 80ab81c60537..542fb0ae9422 100644
--- a/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
+++ b/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
@@ -19,6 +19,7 @@ package com.sun.star.script.framework.io;
 
 import com.sun.star.io.XOutputStream;
 
+import java.io.IOException;
 import java.io.OutputStream;
 
 public class XOutputStreamWrapper extends OutputStream {
@@ -40,8 +41,10 @@ public class XOutputStreamWrapper extends OutputStream {
 
         try {
             m_xOutputStream.writeBytes(bytes);
-        } catch (com.sun.star.io.IOException ioe) {
-            throw new java.io.IOException(ioe.getMessage());
+        } catch (com.sun.star.io.IOException ex1) {
+            IOException ex2 = new IOException();
+            ex2.initCause(ex1);
+            throw ex2;
         }
     }
 
@@ -54,8 +57,10 @@ public class XOutputStreamWrapper extends OutputStream {
 
         try {
             m_xOutputStream.writeBytes(b);
-        } catch (com.sun.star.io.IOException ioe) {
-            throw new java.io.IOException(ioe.getMessage());
+        } catch (com.sun.star.io.IOException ex1) {
+            IOException ex2 = new IOException();
+            ex2.initCause(ex1);
+            throw ex2;
         }
     }
     @Override
@@ -69,8 +74,10 @@ public class XOutputStreamWrapper extends OutputStream {
 
         try {
             m_xOutputStream.writeBytes(bytes);
-        } catch (com.sun.star.io.IOException ioe) {
-            throw new java.io.IOException(ioe.getMessage());
+        } catch (com.sun.star.io.IOException ex1) {
+            IOException ex2 = new IOException();
+            ex2.initCause(ex1);
+            throw ex2;
         }
     }
 
@@ -82,8 +89,10 @@ public class XOutputStreamWrapper extends OutputStream {
 
         try {
             m_xOutputStream.flush();
-        } catch (com.sun.star.io.IOException ioe) {
-            throw new java.io.IOException(ioe.getMessage());
+        } catch (com.sun.star.io.IOException ex1) {
+            IOException ex2 = new IOException();
+            ex2.initCause(ex1);
+            throw ex2;
         }
     }
 
@@ -95,8 +104,10 @@ public class XOutputStreamWrapper extends OutputStream {
 
         try {
             m_xOutputStream.closeOutput();
-        } catch (com.sun.star.io.IOException ioe) {
-            throw new java.io.IOException(ioe.getMessage());
+        } catch (com.sun.star.io.IOException ex1) {
+            IOException ex2 = new IOException();
+            ex2.initCause(ex1);
+            throw ex2;
         }
     }
 }
\ No newline at end of file
diff --git a/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java b/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
index c0132cabc687..0856e6deb2f8 100644
--- a/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
+++ b/scripting/java/com/sun/star/script/framework/io/XStorageHelper.java
@@ -153,9 +153,11 @@ public class XStorageHelper implements XEventListener {
             }
         } catch (com.sun.star.io.IOException ioe) {
             disposeObject();
-        } catch (com.sun.star.uno.Exception e) {
+        } catch (com.sun.star.uno.Exception ex1) {
             disposeObject();
-            throw new IOException(e.getMessage());
+            IOException ex2 = new IOException();
+            ex2.initCause(ex1);
+            throw ex2;
         }
     }
 
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
index e4aa8fc56f7f..59004f02a6bb 100644
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
@@ -144,9 +144,7 @@ class ScriptImpl implements XScript {
         try {
             this.m_xMultiComponentFactory = m_xContext.getServiceManager();
         } catch (Exception e) {
-            LogUtils.DEBUG(LogUtils.getTrace(e));
-            throw new com.sun.star.uno.RuntimeException(
-                "Error constructing  ScriptImpl [beanshell]: " + e.getMessage());
+            throw new com.sun.star.uno.RuntimeException(e);
         }
 
         LogUtils.DEBUG("ScriptImpl [beanshell] script data = " + metaData);
diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
index c347e8097b19..25edc0f851dd 100644
--- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
+++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
@@ -139,9 +139,7 @@ class ScriptImpl implements XScript {
         try {
             this.m_xMultiComponentFactory = m_xContext.getServiceManager();
         } catch (Exception e) {
-            LogUtils.DEBUG(LogUtils.getTrace(e));
-            throw new com.sun.star.uno.RuntimeException(
-                "Error constructing  ScriptImpl: [javascript]");
+            throw new com.sun.star.uno.RuntimeException(e);
         }
 
         LogUtils.DEBUG("ScriptImpl [javascript] script data = " + metaData);