Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2011-11-09 09:52:11 +0000
committerTomasz Zarna2011-11-09 09:52:11 +0000
commitcdb5c15f44856d761e357cbb004a3f6f485029d6 (patch)
tree7c047754ecd4bc2ed735fec260775ff1269c7dc3
parentd03cbd69839cf6517f84af94e15677c334fd0a70 (diff)
downloadeclipse.platform.team-cdb5c15f44856d761e357cbb004a3f6f485029d6.tar.gz
eclipse.platform.team-cdb5c15f44856d761e357cbb004a3f6f485029d6.tar.xz
eclipse.platform.team-cdb5c15f44856d761e357cbb004a3f6f485029d6.zip
bug 361417: [backport][Edit] memory leak in compare with each other
-rw-r--r--bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceSaveableComparison.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF
index c2ea2e96b..ff4803fe9 100644
--- a/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.team.ui; singleton:=true
-Bundle-Version: 3.6.100.qualifier
+Bundle-Version: 3.6.101.qualifier
Bundle-Activator: org.eclipse.team.internal.ui.TeamUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceSaveableComparison.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceSaveableComparison.java
index 8bb426333..0008fa91e 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceSaveableComparison.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceSaveableComparison.java
@@ -107,10 +107,11 @@ public abstract class LocalResourceSaveableComparison extends SaveableComparison
((IContentChangeNotifier) te).removeContentChangeListener(contentChangeListener);
}
}
- // Discard of the left buffer
+ // Discard of the buffer
ITypedElement left = getFileElement();
if (left instanceof LocalResourceTypedElement)
((LocalResourceTypedElement) left).discardBuffer();
+ document = null;
}
private ITypedElement getFileElement() {

Back to the top