summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.5/modules/implementation-spring/src
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2009-05-21 11:30:51 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2009-05-21 11:30:51 +0000
commit373f98464d0b39af1ea882452f84274fef88a7a0 (patch)
treee0564c69cf8bccdba594535ab153299dc98bb931 /branches/sca-java-1.5/modules/implementation-spring/src
parentccc196d0f28c055a21fdb0581de9b8aa1c04e243 (diff)
Merge TUSCANY-3053 fix from 1.x to 1.5
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@777074 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.5/modules/implementation-spring/src')
-rw-r--r--branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java b/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
index 98b59cca9a..50aad250ea 100644
--- a/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
+++ b/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
@@ -24,7 +24,6 @@ import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Iterator;
@@ -177,15 +176,12 @@ public class SpringXMLComponentTypeLoader {
URL resource = getApplicationContextResource(location, cl);
// 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())));
+ XMLStreamReader reader = 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);
}
}