[--to=spearce@spearce.org PATCH] Detect resource changes.

From

Robin Rosenberg <robin.rosenberg@dewire.com>

Date

Apr 24, 2007, 23:31 UTC

Message-ID

<20070424233117.27409.11307.stgit@lathund.dewire.com>

Another oops from the patch to use git ordering in trees.

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
---

 .../spearce/egit/core/project/GitProjectData.java  |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/project/GitProjectData.java b/org.spearce.egit.core/src/org/spearce/egit/core/project/GitProjectData.java
index 00d5186..431e0c4 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/project/GitProjectData.java
+++ b/org.spearce.egit.core/src/org/spearce/egit/core/project/GitProjectData.java
@@ -387,7 +387,8 @@ public class GitProjectData {
 				public boolean visit(final IResourceDelta d)
 						throws CoreException {
 					final int f = d.getFlags();
-					IResource r = d.getResource();
+					IResource res = d.getResource();
+					IResource r = res;
 					if ((f & IResourceDelta.CONTENT) != 0
 							|| (f & IResourceDelta.ENCODING) != 0
 							|| r instanceof IContainer) {
@@ -420,7 +421,7 @@ public class GitProjectData {
 							try {
 								synchronized (cacheTree) {
 									final TreeEntry e;
-									if (r.getType() == IResource.FILE)
+									if (res.getType() == IResource.FILE)
 										e = cacheTree.findBlobMember(s);
 									else
 										e = cacheTree.findTreeMember(s);