getResourceAsInputStream() no longer return null Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/754d005f Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/754d005f Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/754d005f
Branch: refs/heads/ucfpackage-robundle Commit: 754d005f0b0b7769876d104c1cfe23bd5fc6394a Parents: d2c31b6 Author: Stian Soiland-Reyes <[email protected]> Authored: Tue Jun 10 16:08:56 2014 +0100 Committer: Stian Soiland-Reyes <[email protected]> Committed: Thu Jul 2 15:12:19 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/taverna/scufl2/ucfpackage/UCFPackage.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/754d005f/taverna-scufl2-ucfpackage/src/main/java/org/apache/taverna/scufl2/ucfpackage/UCFPackage.java ---------------------------------------------------------------------- diff --git a/taverna-scufl2-ucfpackage/src/main/java/org/apache/taverna/scufl2/ucfpackage/UCFPackage.java b/taverna-scufl2-ucfpackage/src/main/java/org/apache/taverna/scufl2/ucfpackage/UCFPackage.java index 9dfc529..f578ff0 100644 --- a/taverna-scufl2-ucfpackage/src/main/java/org/apache/taverna/scufl2/ucfpackage/UCFPackage.java +++ b/taverna-scufl2-ucfpackage/src/main/java/org/apache/taverna/scufl2/ucfpackage/UCFPackage.java @@ -142,15 +142,15 @@ public class UCFPackage implements Cloneable { @SuppressWarnings("unchecked") protected void parseContainerXML() throws IOException { createdContainerXml = false; - InputStream containerStream = getResourceAsInputStream(CONTAINER_XML); - if (containerStream == null) { + if (getResourceEntry(CONTAINER_XML) == null) { // Make an empty containerXml Container container = containerFactory.createContainer(); containerXml = containerFactory.createContainer(container); createdContainerXml = true; return; } - try { + try { + InputStream containerStream = getResourceAsInputStream(CONTAINER_XML); Unmarshaller unMarshaller = createUnMarshaller(); containerXml = (JAXBElement<Container>) unMarshaller .unmarshal(containerStream);
