Alawn/Java-8583-Util
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix parsing of binary messages

Browse Source
This commit is contained in:
Enrique Zamudio
2013-01-18 13:31:32 -06:00
parent 4d02af0a76
commit 0d2e5409b4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/solab/iso8583/MessageFactory.java
+3 -3
View File
@@ -253,7 +253,7 @@ public class MessageFactory<T extends IsoMessage> {
* and the rest of the message must come. */ * and the rest of the message must come. */
public T parseMessage(byte[] buf, int isoHeaderLength) public T parseMessage(byte[] buf, int isoHeaderLength)
throws ParseException, UnsupportedEncodingException { throws ParseException, UnsupportedEncodingException {
final int minlength = isoHeaderLength+(useBinary?2:4)+(binBitmap ? 8:16); final int minlength = isoHeaderLength+(useBinary?2:4)+(binBitmap||useBinary ? 8:16);
if (buf.length < minlength) { if (buf.length < minlength) {
throw new ParseException("Insufficient buffer length, needs to be at least " + minlength, 0); throw new ParseException("Insufficient buffer length, needs to be at least " + minlength, 0);
} }
@@ -379,7 +379,7 @@ public class MessageFactory<T extends IsoMessage> {
log.warn("Field {} is not really in the message even though it's in the bitmap", i); log.warn("Field {} is not really in the message even though it's in the bitmap", i);
bs.clear(i - 1); bs.clear(i - 1);
} else { } else {
IsoValue<?> val = fpi.parseBinary(buf, pos, getCustomField(i)); IsoValue<?> val = fpi.parseBinary(i, buf, pos, getCustomField(i));
m.setField(i, val); m.setField(i, val);
if (val != null) { if (val != null) {
if (val.getType() == IsoType.NUMERIC || val.getType() == IsoType.DATE10 if (val.getType() == IsoType.NUMERIC || val.getType() == IsoType.DATE10
@@ -406,7 +406,7 @@ public class MessageFactory<T extends IsoMessage> {
log.warn("Field {} is not really in the message even though it's in the bitmap", i); log.warn("Field {} is not really in the message even though it's in the bitmap", i);
bs.clear(i - 1); bs.clear(i - 1);
} else { } else {
IsoValue<?> val = fpi.parse(buf, pos, getCustomField(i)); IsoValue<?> val = fpi.parse(i, buf, pos, getCustomField(i));
m.setField(i, val); m.setField(i, val);
//To get the correct next position, we need to get the number of bytes, not chars //To get the correct next position, we need to get the number of bytes, not chars
pos += val.toString().getBytes(fpi.getCharacterEncoding()).length; pos += val.toString().getBytes(fpi.getCharacterEncoding()).length;