Fixes for TUSCANY-3061
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@778592 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
7010322cbd
commit
c1e6b31c4a
1 changed files with 2 additions and 6 deletions
|
@ -146,7 +146,7 @@ public class SpringXMLComponentTypeLoader {
|
|||
implementation.setURI(resource.toString());
|
||||
// FIXME - need a better way to handle the XMLInputFactory than allocating a new one every time
|
||||
XMLInputFactory xmlFactory = XMLInputFactory.newInstance();
|
||||
reader = xmlFactory.createXMLStreamReader(new FileInputStream(new File(resource.toURI())));
|
||||
reader = xmlFactory.createXMLStreamReader(resource.openStream());
|
||||
|
||||
// System.out.println("Spring TypeLoader - starting to read context file");
|
||||
readContextDefinition(reader, beans, services, references, scaproperties);
|
||||
|
@ -155,8 +155,6 @@ public class SpringXMLComponentTypeLoader {
|
|||
throw new ContributionReadException(e);
|
||||
} catch (XMLStreamException e) {
|
||||
throw new ContributionReadException(e);
|
||||
} catch (URISyntaxException e) {
|
||||
throw new ContributionReadException(e);
|
||||
}
|
||||
|
||||
/* At this point, the complete application-context.xml file has been read and its contents */
|
||||
|
@ -180,14 +178,12 @@ public class SpringXMLComponentTypeLoader {
|
|||
// FIXME - need a better way to handle the XMLInputFactory than allocating a new one every time
|
||||
XMLInputFactory xmlFactory = XMLInputFactory.newInstance();
|
||||
XMLStreamReader reader =
|
||||
xmlFactory.createXMLStreamReader(new FileInputStream(new File(resource.toURI())));
|
||||
xmlFactory.createXMLStreamReader(resource.openStream());
|
||||
return reader;
|
||||
} catch (IOException e) {
|
||||
throw new ContributionReadException(e);
|
||||
} catch (XMLStreamException e) {
|
||||
throw new ContributionReadException(e);
|
||||
} catch (URISyntaxException e) {
|
||||
throw new ContributionReadException(e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue