You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/04/06 17:36:41 UTC
svn commit: r526200 - in
/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl:
ComponentTypeDocumentProcessor.java CompositeDocumentProcessor.java
ConstrainingTypeDocumentProcessor.java
Author: lresende
Date: Fri Apr 6 08:36:40 2007
New Revision: 526200
URL: http://svn.apache.org/viewvc?view=rev&rev=526200
Log:
Adding code to properly close streams
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeDocumentProcessor.java
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeDocumentProcessor.java
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeDocumentProcessor.java
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeDocumentProcessor.java?view=diff&rev=526200&r1=526199&r2=526200
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeDocumentProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ComponentTypeDocumentProcessor.java Fri Apr 6 08:36:40 2007
@@ -20,6 +20,7 @@
package org.apache.tuscany.assembly.xml.impl;
import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
import javax.xml.stream.XMLInputFactory;
@@ -67,8 +68,10 @@
}
public ComponentType read(URL url) throws ContributionReadException {
+ InputStream urlStream = null;
try {
- XMLStreamReader reader = inputFactory.createXMLStreamReader(url.openStream());
+ urlStream = url.openStream();
+ XMLStreamReader reader = inputFactory.createXMLStreamReader(urlStream);
ComponentType componentType = (ComponentType)registry.read(reader);
return componentType;
@@ -76,6 +79,15 @@
throw new ContributionReadException(e);
} catch (IOException e) {
throw new ContributionReadException(e);
+ } finally {
+ try {
+ if (urlStream != null) {
+ urlStream.close();
+ urlStream = null;
+ }
+ } catch (IOException ioe) {
+ //ignore
+ }
}
}
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeDocumentProcessor.java?view=diff&rev=526200&r1=526199&r2=526200
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeDocumentProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/CompositeDocumentProcessor.java Fri Apr 6 08:36:40 2007
@@ -20,6 +20,7 @@
package org.apache.tuscany.assembly.xml.impl;
import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
import javax.xml.stream.XMLInputFactory;
@@ -67,8 +68,10 @@
}
public Composite read(URL url) throws ContributionReadException {
+ InputStream urlStream = null;
try {
- XMLStreamReader reader = inputFactory.createXMLStreamReader(url.openStream());
+ urlStream = url.openStream();
+ XMLStreamReader reader = inputFactory.createXMLStreamReader(urlStream);
Composite composite = (Composite)registry.read(reader);
return composite;
@@ -76,6 +79,15 @@
throw new ContributionReadException(e);
} catch (IOException e) {
throw new ContributionReadException(e);
+ } finally {
+ try {
+ if (urlStream != null) {
+ urlStream.close();
+ urlStream = null;
+ }
+ } catch (IOException ioe) {
+ //ignore
+ }
}
}
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeDocumentProcessor.java?view=diff&rev=526200&r1=526199&r2=526200
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeDocumentProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/impl/ConstrainingTypeDocumentProcessor.java Fri Apr 6 08:36:40 2007
@@ -20,6 +20,7 @@
package org.apache.tuscany.assembly.xml.impl;
import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
import javax.xml.stream.XMLInputFactory;
@@ -68,8 +69,10 @@
}
public ConstrainingType read(URL url) throws ContributionReadException {
+ InputStream urlStream = null;
try {
- XMLStreamReader reader = inputFactory.createXMLStreamReader(url.openStream());
+ urlStream = url.openStream();
+ XMLStreamReader reader = inputFactory.createXMLStreamReader(urlStream);
ConstrainingType constrainingType = (ConstrainingType)registry.read(reader);
return constrainingType;
@@ -77,7 +80,17 @@
throw new ContributionReadException(e);
} catch (IOException e) {
throw new ContributionReadException(e);
+ } finally {
+ try {
+ if (urlStream != null) {
+ urlStream.close();
+ urlStream = null;
+ }
+ } catch (IOException ioe) {
+ //ignore
+ }
}
+
}
public void resolve(ConstrainingType constrainingType, ArtifactResolver resolver) throws ContributionException {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org