Author: rob.stryker(a)jboss.com Date: 2012-04-19 20:59:05 -0400 (Thu, 19 Apr 2012) New Revision: 40370 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerExtendedProperties.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java Log: cleanup and npe protection Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerExtendedProperties.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerExtendedProperties.java 2012-04-20 00:40:00 UTC (rev 40369) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerExtendedProperties.java 2012-04-20 00:59:05 UTC (rev 40370) @@ -11,13 +11,9 @@ package org.jboss.tools.openshift.express.internal.core.behaviour; import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.osgi.util.NLS; import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.ServerExtendedProperties; -import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import com.openshift.client.IApplication; -import com.openshift.client.OpenShiftException; public class ExpressServerExtendedProperties extends ServerExtendedProperties { Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-04-20 00:40:00 UTC (rev 40369) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-04-20 00:59:05 UTC (rev 40370) @@ -342,7 +342,7 @@ String user = ExpressServerUtils.getExpressUsername(server); UserDelegate user2 = UserModel.getDefault().findUser(user); String appName = ExpressServerUtils.getExpressApplicationName(server); - IApplication app = user2.getApplicationByName(appName); + IApplication app = user2 == null ? null : user2.getApplicationByName(appName); return app; } catch(OpenShiftException ose) { Logger.error(NLS.bind("Could not find application for server {0}", server.getName()));