You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2006/09/26 21:50:09 UTC
svn commit: r450167 -
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
Author: dims
Date: Tue Sep 26 12:50:09 2006
New Revision: 450167
URL: http://svn.apache.org/viewvc?view=rev&rev=450167
Log:
fix for AXIS2-1240 - r449727 breaks JAXWS tests
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?view=diff&rev=450167&r1=450166&r2=450167
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java Tue Sep 26 12:50:09 2006
@@ -229,7 +229,8 @@
File file1 = files[i];
if (file1.getName().toLowerCase().endsWith(SUFFIX_WSDL)) {
InputStream in = new FileInputStream(file1);
-
+ FileInputStream in2 = null;
+
// now the question is which version of WSDL file this archive contains.
// lets check the namespace of the root element and decide. But since we are
// using axiom (dude, you are becoming handy here :)), we will not build the
@@ -239,30 +240,23 @@
WSDLToAxisServiceBuilder wsdlToAxisServiceBuilder = null;
if (WSDLConstants.WSDL20_2006Constants.DEFAULT_NAMESPACE_URI.equals(documentElementNS.getNamespaceURI())) {
// we have a WSDL 2.0 document here.
- FileInputStream in2 = new FileInputStream(file1);
+ in2 = new FileInputStream(file1);
wsdlToAxisServiceBuilder = new WSDL20ToAxisServiceBuilder(in2, null, null);
- try {
- in2.close();
- } catch (IOException e) {
- log.info(e);
- }
} else if (Constants.NS_URI_WSDL11.
equals(documentElementNS.getNamespaceURI())) {
- FileInputStream in2 = new FileInputStream(file1);
+ in2 = new FileInputStream(file1);
wsdlToAxisServiceBuilder = new WSDL11ToAxisServiceBuilder(in2, null, null);
- try {
- in2.close();
- } catch (IOException e) {
- log.info(e);
- }
} else {
new DeploymentException(Messages.getMessage("invalidWSDLFound"));
}
- FileInputStream in2 = new FileInputStream(file1);
+ FileInputStream in3 = new FileInputStream(file1);
AxisService service = processWSDLFile(wsdlToAxisServiceBuilder, file1, false, in2);
try {
- in2.close();
+ if(in2 != null) {
+ in2.close();
+ }
+ in3.close();
} catch (IOException e) {
log.info(e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org