diff options
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/StorageStreamMerger.java')
| -rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/StorageStreamMerger.java | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/StorageStreamMerger.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/StorageStreamMerger.java index eb520d922..39d66957a 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/StorageStreamMerger.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/StorageStreamMerger.java @@ -60,26 +60,26 @@ public class StorageStreamMerger implements IStorageMerger { if (status.getCode() == IStreamMerger.CONFLICT) return new Status(status.getSeverity(), status.getPlugin(), CONFLICT, status.getMessage(), status.getException()); return status; - } finally { - try { - if (ancestorStream != null) - ancestorStream.close(); - } catch (IOException e) { - // Ignore - } - try { - if (remoteStream != null) - remoteStream.close(); - } catch (IOException e) { - // Ignore - } - try { - if (targetStream != null) - targetStream.close(); - } catch (IOException e) { - // Ignore - } - } + } finally { + try { + if (ancestorStream != null) + ancestorStream.close(); + } catch (IOException e) { + // Ignore + } + try { + if (remoteStream != null) + remoteStream.close(); + } catch (IOException e) { + // Ignore + } + try { + if (targetStream != null) + targetStream.close(); + } catch (IOException e) { + // Ignore + } + } } private String getEncoding(IStorage ancestorStorage, String outputEncoding) { |