You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2009/05/21 13:30:51 UTC

svn commit: r777074 - in /tuscany/branches/sca-java-1.5/modules/implementation-spring: ./ src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java

Author: antelder
Date: Thu May 21 11:30:51 2009
New Revision: 777074

URL: http://svn.apache.org/viewvc?rev=777074&view=rev
Log:
Merge TUSCANY-3053 fix from 1.x to 1.5

Modified:
    tuscany/branches/sca-java-1.5/modules/implementation-spring/   (props changed)
    tuscany/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java

Propchange: tuscany/branches/sca-java-1.5/modules/implementation-spring/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 21 11:30:51 2009
@@ -1,2 +1,2 @@
 /tuscany/branches/sca-java-1.3/modules/implementation-spring:671193
-/tuscany/branches/sca-java-1.x/modules/implementation-spring:776966,776969
+/tuscany/branches/sca-java-1.x/modules/implementation-spring:776966,776969,777017

Modified: tuscany/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java?rev=777074&r1=777073&r2=777074&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java (original)
+++ tuscany/branches/sca-java-1.5/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java Thu May 21 11:30:51 2009
@@ -24,7 +24,6 @@
 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 @@
             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);
         }
     }