summaryrefslogtreecommitdiff
path: root/javaunohelper
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-09-17 16:56:19 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-09-17 16:59:53 +0200
commit543158edba6678d3d76eee983a9d4edd2a422fee (patch)
tree458133435b06afd5b50379c058a0f886fe9e82c1 /javaunohelper
parent6e78fd18c9ca2d70af93cad321f55f3d72172742 (diff)
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 'javaunohelper')
-rw-r--r--javaunohelper/com/sun/star/comp/helper/ComponentContext.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
index 5075eb8d224d..2294af8a12bd 100644
--- a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
+++ b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
@@ -207,6 +207,11 @@ public class ComponentContext implements XComponentContext, XComponent
//______________________________________________________________________________________________
public XMultiComponentFactory getServiceManager()
{
+ if (m_xSMgr == null)
+ {
+ throw new com.sun.star.uno.RuntimeException(
+ "null component context service manager" );
+ }
return m_xSMgr;
}