Skip to content
Browse files

fix stupid NPE

  • Loading branch information...
1 parent a5c8269 commit ef1c37a34e144007af7824258e6af88927d0427c @atoulme atoulme committed
Showing with 9 additions and 7 deletions.
  1. +5 −5 api/.classpath
  2. +4 −2 designer/src/main/java/org/wapama/web/Activator.java
View
10 api/.classpath
@@ -1,7 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry path="src/main/java" excluding="**/.svn/|**/CVS/" kind="src"/>
- <classpathentry path="target/classes" kind="output"/>
- <classpathentry path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" kind="var" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar" javadocpath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-javadoc.jar"/>
- <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con"/>
- <classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" kind="con"/>
+ <classpathentry excluding="**/.svn/|**/CVS/" kind="src" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
View
6 designer/src/main/java/org/wapama/web/Activator.java
@@ -51,8 +51,10 @@ public void start(final BundleContext context) throws Exception {
{
ServiceReference sRef =
context.getServiceReference(IDiagramPreferenceService.class.getName());
- IDiagramPreferenceService service = (IDiagramPreferenceService) context.getService(sRef);
- EditorHandler.PREFERENCE_FACTORY = service;
+ if (sRef != null) {
+ IDiagramPreferenceService service = (IDiagramPreferenceService) context.getService(sRef);
+ EditorHandler.PREFERENCE_FACTORY = service;
+ }
//use a service tracker to be called back when the IUUIDBasedRepositoryFactory is ready:
ServiceTrackerCustomizer cust = new ServiceTrackerCustomizer() {

0 comments on commit ef1c37a

Please sign in to comment.
Something went wrong with that request. Please try again.