Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved checkForUtf8ByteOrderMark

Browse Source 
Improved algorithm to check for UTF-8 Byte Order Marks. No longer expect
all three starting bytes to be read at once, but reads them as blocks.

Issue: SWS-845
This commit is contained in:
Arjen Poutsma
2013-08-20 12:23:41 +02:00
parent 1ff4d4746e
commit e2f10c331a
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessageFactory.java
View File

@@ -251,8 +251,16 @@ public class SaajSoapMessageFactory implements SoapMessageFactory, InitializingB
private InputStream checkForUtf8ByteOrderMark(InputStream inputStream) throws IOException {
PushbackInputStream pushbackInputStream = new PushbackInputStream(new BufferedInputStream(inputStream), 3);
byte[] bytes = new byte[3];
int bytesRead = pushbackInputStream.read(bytes);
if (bytesRead != -1) {
int bytesRead = 0;
while (bytesRead < bytes.length) {
int n = pushbackInputStream.read(bytes, bytesRead, bytes.length - bytesRead);
if (n > 0) {
bytesRead += n;
} else {
break;
}
}
if (bytesRead > 0) {
// check for the UTF-8 BOM, and remove it if there. See SWS-393
if (!isByteOrderMark(bytes)) {
pushbackInputStream.unread(bytes, 0, bytesRead);