Author: rob.stryker(a)jboss.com Date: 2012-06-04 09:17:25 -0400 (Mon, 04 Jun 2012) New Revision: 41676 Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/SelectServerActionDelegate.java Log: jbide-12060 and jbide-12059 for cr1, null safety Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java =================================================================== --- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2012-06-04 13:17:06 UTC (rev 41675) +++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2012-06-04 13:17:25 UTC (rev 41676) @@ -94,6 +94,9 @@ } public static boolean isJBossServerType(IServerType type) { + if( type == null ) + return false; + // If we start with AS or EAP serverIds and are NOT deploy-only server return !type.getId().equals(IJBossToolingConstants.DEPLOY_ONLY_SERVER) && (type.getId().startsWith(IJBossToolingConstants.SERVER_AS_PREFIX) @@ -105,6 +108,8 @@ } public static boolean isJBoss7(IServerType type) { + if( type == null ) + return false; return type.getId().equals(IJBossToolingConstants.SERVER_AS_70) || type.getId().equals(IJBossToolingConstants.SERVER_AS_71) || type.getId().equals(IJBossToolingConstants.SERVER_EAP_60); Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/SelectServerActionDelegate.java =================================================================== --- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/SelectServerActionDelegate.java 2012-06-04 13:17:06 UTC (rev 41675) +++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/SelectServerActionDelegate.java 2012-06-04 13:17:25 UTC (rev 41676) @@ -56,7 +56,7 @@ private void update0() { if(action == null) return; IServer server = ServerManager.getInstance().getSelectedServer(); - if( server != null ) { + if( server != null && server.getServerType() != null ) { ImageDescriptor id = ImageResource.getImageDescriptor(server.getServerType().getId()); action.setImageDescriptor(id); }