Author: rob.stryker(a)jboss.com Date: 2011-04-28 13:20:58 -0400 (Thu, 28 Apr 2011) New Revision: 30920 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java Log: 17 Tests Failing due to npe Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-04-28 17:05:59 UTC (rev 30919) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-04-28 17:20:58 UTC (rev 30920) @@ -39,7 +39,7 @@ @Deprecated public static IPath makeRelative(IJBossServerRuntime rt, IPath p) { - if( rt.getRuntime() != null ) + if( rt != null && rt.getRuntime() != null ) return makeRelative(rt.getRuntime(), p); return p; } @@ -56,7 +56,7 @@ @Deprecated public static IPath makeGlobal(IJBossServerRuntime rt, IPath p) { - if( rt == null || rt.getRuntime() != null ) + if( rt != null && rt.getRuntime() != null ) return makeGlobal(rt.getRuntime(), p); return p; }