Author: dvinnichek Date: 2010-09-24 12:46:21 -0400 (Fri, 24 Sep 2010) New Revision: 25159 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java Log: fixed NPE when trying open file from linked folder (https://jira.jboss.org/browse/JBIDE-7161) Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2010-09-24 15:32:42 UTC (rev 25158) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2010-09-24 16:46:21 UTC (rev 25159) @@ -180,10 +180,9 @@ public static XModelObject addFileSystem(IResource resource, XModel model) { XModelObject fss = FileSystemsHelper.getFileSystems(model); - if(fss == null) return null; - if(resource == null) return null; + if(fss == null || resource == null) return null; Properties properties = new Properties(); - String fsLoc = resource.getLocation().toString(); + String fsLoc = resource.getLocation() != null ? resource.getLocation().toString() : resource.getLocationURI().toString(); if(resource == resource.getProject()) { fsLoc = "%" + IModelNature.ECLIPSE_PROJECT + "%"; //$NON-NLS-1$ //$NON-NLS-2$ } else {