diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-17 16:56:19 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-17 16:59:53 +0200 |
commit | 543158edba6678d3d76eee983a9d4edd2a422fee (patch) | |
tree | 458133435b06afd5b50379c058a0f886fe9e82c1 /codemaker/test | |
parent | revised MacOSX mimetype icons (diff) | |
download | core-543158edba6678d3d76eee983a9d4edd2a422fee.tar.gz core-543158edba6678d3d76eee983a9d4edd2a422fee.zip |
Require XComponentContext.getServiceManager to throw instead of returning null
This is such a fatal error that there is probably no point in trying to handle
it, so allow to simplify client code by removing the requirement to check for a
null return value.
Simplified some client code accordingly (modules configmgr and ure, and the code
generated by cppumaker and javamaker).
Change-Id: I51c0b270ec73409374f7439a47ee061407a46e31
Diffstat (limited to 'codemaker/test')
-rw-r--r-- | codemaker/test/javamaker/java15/Test.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/codemaker/test/javamaker/java15/Test.java b/codemaker/test/javamaker/java15/Test.java index 30b9e08d68ab..40401cf010be 100644 --- a/codemaker/test/javamaker/java15/Test.java +++ b/codemaker/test/javamaker/java15/Test.java @@ -19,7 +19,6 @@ package test.codemaker.javamaker.java15; import com.sun.star.lang.XMultiComponentFactory; -import com.sun.star.uno.DeploymentException; import com.sun.star.uno.XComponentContext; import complexlib.ComplexTestCase; @@ -69,18 +68,18 @@ public final class Test extends ComplexTestCase { } public XMultiComponentFactory getServiceManager() { - return null; + throw new com.sun.star.uno.RuntimeException(); } }; try { Service.create(context); failed(); - } catch (DeploymentException e) {} + } catch (com.sun.star.uno.RuntimeException e) {} try { Service.create( context, false, (byte) 1, (short) 2, Integer.valueOf(4)); failed(); - } catch (DeploymentException e) {} + } catch (com.sun.star.uno.RuntimeException e) {} } private static final class Ifc implements XIfc { |