[jbosstools-commits] JBoss Tools SVN: r31187 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model: project/ext and 1 other directory.
Author: scabanovich
Date: 2011-05-10 12:15:30 -0400 (Tue, 10 May 2011)
New Revision: 31187
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/FileSystemsHelper.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/AbstractClassPathMonitor.java
Log:
JBIDE-8916
https://issues.jboss.org/browse/JBIDE-8916
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/FileSystemsHelper.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/FileSystemsHelper.java 2011-05-10
16:06:51 UTC (rev 31186)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/FileSystemsHelper.java 2011-05-10
16:15:30 UTC (rev 31187)
@@ -18,7 +18,7 @@
public static final String FILE_SYSTEMS = "FileSystems"; //$NON-NLS-1$
public static XModelObject getFileSystems(XModel model) {
- return model.getByPath(FILE_SYSTEMS);
+ return model == null ? null : model.getByPath(FILE_SYSTEMS);
}
public static XModelObject getFileSystem(XModel model, String name) {
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/AbstractClassPathMonitor.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/AbstractClassPathMonitor.java 2011-05-10
16:06:51 UTC (rev 31186)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/AbstractClassPathMonitor.java 2011-05-10
16:15:30 UTC (rev 31187)
@@ -57,6 +57,9 @@
*/
public synchronized boolean update() {
Libs libs = FileSystemsHelper.getLibs(model);
+ if(libs == null) {
+ return false;
+ }
libs.update();
List<String> newPaths = libs.getPaths();
boolean result = libsModified || !loaded;