diff options
author | pmoogk | 2006-08-18 19:10:40 +0000 |
---|---|---|
committer | pmoogk | 2006-08-18 19:10:40 +0000 |
commit | d2f132dea08ccf34ec2de79988c743f85acbb1df (patch) | |
tree | 89800e5bbb3a8bc739f3ef92fbea8465c0716d0a /bundles/org.eclipse.wst.ws.parser | |
parent | c9f81e210cba37d777ad7fe427119767c8e51351 (diff) | |
download | webtools.webservices-d2f132dea08ccf34ec2de79988c743f85acbb1df.tar.gz webtools.webservices-d2f132dea08ccf34ec2de79988c743f85acbb1df.tar.xz webtools.webservices-d2f132dea08ccf34ec2de79988c743f85acbb1df.zip |
[154393] Parser does not read the encoding in a WSIL file.
Diffstat (limited to 'bundles/org.eclipse.wst.ws.parser')
-rw-r--r-- | bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServicesParser.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServicesParser.java b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServicesParser.java index 0a4519903..f47b80758 100644 --- a/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServicesParser.java +++ b/bundles/org.eclipse.wst.ws.parser/src/org/eclipse/wst/ws/internal/parser/wsil/WebServicesParser.java @@ -12,6 +12,7 @@ * 20060504 119296 pmoogk@ca.ibm.com - Peter Moogk * 20060517 142324 rsinha@ca.ibm.com - Rupam Kuehner * 20060711 150301 pmoogk@ca.ibm.com - Peter Moogk + * 20060818 154393 pmoogk@ca.ibm.com - Peter Moogk *******************************************************************************/ package org.eclipse.wst.ws.internal.parser.wsil; @@ -148,9 +149,16 @@ public class WebServicesParser byte[] b = getInputStreamAsByteArray(wsilURI); wsEntity.setBytes(b); setHTTPSettings(wsEntity); - InputStreamReader isr = new InputStreamReader(new ByteArrayInputStream(b), byteEncoding ); + + // This parser only checks the header of HTML for a particular encoding. + // It doesn't check the encoding for general XML documents like WSDL and WSIL. + // This causing this parser to alway use UTF-8 as the encoding. Therefore, + // since we can not trust the encoding specified we will not use it. Instead, + // we will just let the WSIL parser figure out what encoding to use. + + //InputStreamReader isr = new InputStreamReader(new ByteArrayInputStream(b), byteEncoding ); wsilDocument = WSILDocument.newInstance(); - wsilDocument.read(isr); + wsilDocument.read(wsilURI); wsEntity.setType(WebServiceEntity.TYPE_WSIL); wsEntity.setModel(wsilDocument); } |