408511: ensure that stream is closed when accessing branding images

Change-Id: I160e4ffd099392f5eea60b2fa88ae4a5a48f5199
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=408511

1 files changed, 21 insertions, 5 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/RepositoryConnectorUiExtensionReader.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/RepositoryConnectorUiExtensionReader.java
index 21b21a447..b84496799 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/RepositoryConnectorUiExtensionReader.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/RepositoryConnectorUiExtensionReader.java
@@ -11,8 +11,8 @@
 
 package org.eclipse.mylyn.internal.tasks.ui.util;
 
+import java.io.IOException;
 import java.io.InputStream;
-import java.util.Set;
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.IAdaptable;
@@ -91,17 +91,33 @@ public class RepositoryConnectorUiExtensionReader {
 				if (branding != null) {
 					InputStream brandingImageData = branding.getBrandingImageData();
 					if (brandingImageData != null) {
-						TasksUiPlugin.getDefault().addBrandingIcon(connector.getConnectorKind(),
-								getImage(brandingImageData));
+						try {
+							TasksUiPlugin.getDefault().addBrandingIcon(connector.getConnectorKind(),
+									getImage(brandingImageData));
+						} finally {
+							closeQuietly(brandingImageData);
+						}
 					}
 					InputStream overlayImageData = branding.getOverlayImageData();
 					if (overlayImageData != null) {
-						TasksUiPlugin.getDefault().addOverlayIcon(connector.getConnectorKind(),
-								getImageDescriptor(overlayImageData));
+						try {
+							TasksUiPlugin.getDefault().addOverlayIcon(connector.getConnectorKind(),
+									getImageDescriptor(overlayImageData));
+						} finally {
+							closeQuietly(brandingImageData);
+						}
 					}
 				}
 			}
 
+			private void closeQuietly(InputStream in) {
+				try {
+					in.close();
+				} catch (IOException e) {
+					// ignore
+				}
+			}
+
 			@SuppressWarnings("unchecked")
 			public <T> T loadAdapter(final AbstractRepositoryConnector connector, Class<T> klass) {
 				T adapter = null;