aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Thun2011-02-04 05:10:50 (EST)
committerPhilipp Thun2011-02-04 05:13:25 (EST)
commit1b30bfc57274a74213625f0c209680a595ae1838 (patch)
tree2ea635be21dc94c869bd3d433d3db82b509c7ba2
parent4c879313cd1332e594b1ad20b1485bdff9533034 (diff)
downloadegit-1b30bfc57274a74213625f0c209680a595ae1838.zip
egit-1b30bfc57274a74213625f0c209680a595ae1838.tar.gz
egit-1b30bfc57274a74213625f0c209680a595ae1838.tar.bz2
Fix missing decoration for conflicting filesrefs/changes/13/2413/1
Change I0d63413c644b4dcfe9aaa6052e397673feaae6fb (Queue decoration requests) introduced a problem related to conflicting files - they were not decorated properly, but exceptions were written to the Eclipse log. Change-Id: I71713ec3389ac6acea23ad1a46957d8be930f53c Signed-off-by: Philipp Thun <philipp.thun@sap.com>
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceHelper.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceHelper.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceHelper.java
index bfe3bdb..89b8567 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceHelper.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceHelper.java
@@ -99,8 +99,10 @@ class DecoratableResourceHelper {
i = resourcePaths.indexOf(treeWalk.getPathString());
if (i != -1) {
try {
- decoratableResources[i] = decorateResource(
- new DecoratableResource(resources[i]), treeWalk);
+ if (decoratableResources[i] == null)
+ decoratableResources[i] = decorateResource(
+ new DecoratableResource(resources[i]),
+ treeWalk);
} catch (IOException e) {
// Ignore - decoratableResources[i] is null
}