Author: rob.stryker(a)jboss.com Date: 2010-01-04 12:23:33 -0500 (Mon, 04 Jan 2010) New Revision: 19641 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetActionProvider.java Log: JBIDE-5576 - NPE in new fileset wizard on servers with no runtime Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetActionProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetActionProvider.java 2010-01-04 16:56:27 UTC (rev 19640) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/FilesetActionProvider.java 2010-01-04 17:23:33 UTC (rev 19641) @@ -204,8 +204,12 @@ location = IConstants.SERVER + IPath.SEPARATOR + runtime.getJBossConfiguration(); } } - if( location == null ) + if( location == null && iserver.getRuntime() != null) location = iserver.getRuntime().getLocation().toOSString(); + else if( location == null && iserver.getRuntime() == null ) { + // use workspace location as default if no runtime + location = ResourcesPlugin.getWorkspace().getRoot().getLocation().toOSString(); + } if (location != null) { FilesetDialog d = new FilesetDialog(new Shell(), location, iserver);