diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2019-08-08 08:49:21 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2019-08-08 10:21:31 +0200 |
commit | c4bb20a47981126a3ca3645c3a06afa963184fb9 (patch) | |
tree | 9118ac9b4e703e23753855cb65ed59a4d56a113e /scripting/java | |
parent | 94d78b5a4b4225188b1e5c340a064b657b206372 (diff) |
Remove odd catch of ArrayStoreException
...(which is a RuntimeException) around a call of
com.sun.star.script.framework.provider.ClassLoaderFactory.getURLClassLoader.
The catch block was introduced in 3076ea9dc6677dcf0f65c53c8f205d870dc27d53
"INTEGRATION: CWS scriptingf2 (1.2.2); FILE MERGED", for no apparent reason. It
was introduced along with catch blocks for MalformedURLException and
NoSuitableClassLoaderException, but which have already been removed with
616b3ad50404f35d84708b3feeb8c66f2f23f1b1 "java: remove exceptions from throws
clauses that are not".
Change-Id: I8d2890aed1b0f50fe817002cb6f1610c550568f1
Reviewed-on: https://gerrit.libreoffice.org/77140
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'scripting/java')
-rw-r--r-- | scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java index 5ffffa59407d..eeea0d49ebe5 100644 --- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java +++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java @@ -182,25 +182,12 @@ class ScriptImpl implements XScript { ScriptDescriptor scriptDesc = new ScriptDescriptor(metaData.getLanguageName()); - ClassLoader scriptLoader = null; + LogUtils.DEBUG("Classloader starting..."); - try { - LogUtils.DEBUG("Classloader starting..."); - - scriptLoader = - ClassLoaderFactory.getURLClassLoader(metaData); + ClassLoader scriptLoader = + ClassLoaderFactory.getURLClassLoader(metaData); - LogUtils.DEBUG("Classloader finished..."); - } catch (ArrayStoreException e) { - // Framework error - ScriptFrameworkErrorException e2 = - new ScriptFrameworkErrorException( - e.toString(), null, - metaData.getLanguageName(), metaData.getLanguage(), - ScriptFrameworkErrorType.UNKNOWN); - e2.initCause(e); - throw e2; - } + LogUtils.DEBUG("Classloader finished..."); ArrayList<Object> invocationArgList = new ArrayList<Object>(); Object[] invocationArgs = null; |