Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2010-11-04 13:14:45 -0400
committerTomasz Zarna2010-11-04 13:14:45 -0400
commitb0c170575d7a92b0f9e784747359abd0fb59d5f0 (patch)
tree12ea9c918f40eb4ee8789690bb3a9ad0759faf1d /bundles
parenteca1abb2800be8c37bc4e567db717e5a47cbe01a (diff)
downloadeclipse.platform.team-b0c170575d7a92b0f9e784747359abd0fb59d5f0.tar.gz
eclipse.platform.team-b0c170575d7a92b0f9e784747359abd0fb59d5f0.tar.xz
eclipse.platform.team-b0c170575d7a92b0f9e784747359abd0fb59d5f0.zip
bug 216105: Stream is being closed in LineComparator constructor
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/LineComparator.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/LineComparator.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/LineComparator.java
index c5ad805ce..879745e74 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/LineComparator.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/LineComparator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
+ * Copyright (c) 2004, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,6 +12,7 @@ package org.eclipse.team.internal.ui.mapping;
import java.io.*;
import java.util.ArrayList;
+
import org.eclipse.compare.rangedifferencer.IRangeComparator;
import org.eclipse.core.resources.IEncodedStorage;
import org.eclipse.core.resources.IStorage;
@@ -101,10 +102,6 @@ class LineComparator implements IRangeComparator {
while ((line = br.readLine()) != null) {
ar.add(line);
}
- try {
- is.close();
- } catch (IOException e1) {
- }
// Add a trailing line if the last character in the file was a line feed.
// We do this because a BufferedReader doesn't distinguish the case
// where the last line has or doesn't have a trailing line separator

Back to the top