diff options
| author | Carl Anderson | 2013-05-14 16:34:02 +0000 |
|---|---|---|
| committer | Carl Anderson | 2013-05-14 16:34:02 +0000 |
| commit | 2f66eaa0919553d9b763b34a6d1cf813505d8e1c (patch) | |
| tree | b41d11bacd76f0cb2fb7128763487a0255e45656 | |
| parent | c3e836435fa4f16c09137e4fc89f46a03ee454d2 (diff) | |
| download | webtools.common-2f66eaa0919553d9b763b34a6d1cf813505d8e1c.tar.gz webtools.common-2f66eaa0919553d9b763b34a6d1cf813505d8e1c.tar.xz webtools.common-2f66eaa0919553d9b763b34a6d1cf813505d8e1c.zip | |
[407572] URIHelper.getInputStream() does not work properly if anv201305141800
InterruptedException happens.
| -rw-r--r-- | plugins/org.eclipse.wst.common.uriresolver/META-INF/MANIFEST.MF | 2 | ||||
| -rw-r--r-- | plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/URIHelper.java | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/plugins/org.eclipse.wst.common.uriresolver/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.uriresolver/META-INF/MANIFEST.MF index a47590047..f6397761e 100644 --- a/plugins/org.eclipse.wst.common.uriresolver/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.wst.common.uriresolver/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wst.common.uriresolver; singleton:=true -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 1.2.100.qualifier Bundle-Activator: org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/URIHelper.java b/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/URIHelper.java index 333b8ea02..3655c4ded 100644 --- a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/URIHelper.java +++ b/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/URIHelper.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012 IBM Corporation and others. + * Copyright (c) 2012 - 2013 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 @@ -78,6 +78,9 @@ public class URIHelper { streamOpener.interrupt(); } catch (InterruptedException e) { + if (result[0] == null){ + result[0] = connection.getInputStream();//bug407211 + } Thread.currentThread().interrupt(); } } |