Author: dgolovin
Date: 2010-01-12 20:11:17 -0500 (Tue, 12 Jan 2010)
New Revision: 19722
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsRenameListener.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/XMarkerManager.java
Log:
potential NullPointerExceptions fix where IResourceCahngeEvent.getDelta() used.
null check added.
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsRenameListener.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsRenameListener.java 2010-01-13
00:54:52 UTC (rev 19721)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsRenameListener.java 2010-01-13
01:11:17 UTC (rev 19722)
@@ -52,7 +52,7 @@
}
private String[] processDelta(IResourceDelta delta) {
- if(delta == null) return null;
+ if(delta == null) return new String[0];
String[] r = extractRename(delta);
if(r != null) return r;
IResourceDelta[] cs = delta.getAffectedChildren();
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/XMarkerManager.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/XMarkerManager.java 2010-01-13
00:54:52 UTC (rev 19721)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/XMarkerManager.java 2010-01-13
01:11:17 UTC (rev 19722)
@@ -51,9 +51,11 @@
}
if(o instanceof IWorkspace) {
IResourceDelta d = event.getDelta();
- IResourceDelta[] cs = d.getAffectedChildren();
- for (int i = 0; i < cs.length && project == null; i++) {
- project = cs[i].getResource().getProject();
+ if(d != null) {
+ IResourceDelta[] cs = d.getAffectedChildren();
+ for (int i = 0; i < cs.length && project == null; i++) {
+ project = cs[i].getResource().getProject();
+ }
}
}
final IProject p = project;
Show replies by date