Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix incorrect message size; Use nio for decoding. #598

Merged
merged 1 commit into from
Sep 6, 2012
+40 −34
Merged

Fix incorrect message size; Use nio for decoding. #598

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 40 additions & 34 deletions modules/cpr/src/main/java/org/atmosphere/client/TrackMessageSizeInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@

import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.CharacterCodingException;
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
import java.nio.charset.CharsetEncoder;

/**
* An {@link org.atmosphere.cpr.AtmosphereInterceptor} that add a add message size and delimiter.
Expand All @@ -43,9 +49,13 @@ public class TrackMessageSizeInterceptor extends AtmosphereInterceptorAdapter {

private static final Logger logger = LoggerFactory.getLogger(TrackMessageSizeInterceptor.class);
private final static byte[] END = "|".getBytes();
private final static String IN_ENCODING = "UTF-8";
private final static String OUT_ENCODING = "UTF-8";

private byte[] end = END;
private String endString = "|";
private CharsetDecoder decoder = Charset.forName(IN_ENCODING).newDecoder();
private CharsetEncoder encoder = Charset.forName(OUT_ENCODING).newEncoder();

@Override
public void configure(AtmosphereConfig config) {
Expand All @@ -72,17 +82,9 @@ public void prePayload(AtmosphereResponse response, byte[] data, int offset, int
}

@Override
public byte[] transformPayload(byte[] responseDraft, byte[] data) throws IOException {

// TODO: This is totally inefficient, I know!
String s = new String(responseDraft, response.getCharacterEncoding());
if (s.trim().length() != 0) {
s = s.length() + endString + s;

return s.getBytes(response.getCharacterEncoding());
} else {
return responseDraft;
}
public byte[] transformPayload(byte[] responseDraft, byte[] data) throws IOException {
response.setCharacterEncoding(OUT_ENCODING);
return transform(responseDraft);
}

@Override
Expand All @@ -102,37 +104,24 @@ public String filter(AtmosphereResponse r, String message) {

@Override
public byte[] filter(AtmosphereResponse r, byte[] message) {

// TODO: This is totally inefficient, I know!
String s = null;
try {
s = new String(message, r.getCharacterEncoding());
} catch (UnsupportedEncodingException e) {
try {
r.setCharacterEncoding(OUT_ENCODING);
return transform(message);
} catch (CharacterCodingException e) {
logger.trace("", e);
}
s = s.length() + endString + s;

try {
return s.getBytes(response.getCharacterEncoding());
} catch (UnsupportedEncodingException e) {
logger.trace("", e);
}
return message;
}

@Override
public byte[] filter(AtmosphereResponse r, byte[] message, int offset, int length) {
// TODO: This is totally inefficient, I know!
String s = null;
try {
s = new String(message, offset, length, r.getCharacterEncoding());
} catch (UnsupportedEncodingException e) {
public byte[] filter(AtmosphereResponse r, byte[] message, int offset, int length) {
try {
r.setCharacterEncoding(OUT_ENCODING);
return transform(message, offset, length);
} catch (CharacterCodingException e) {
logger.trace("", e);
}
s = s.length() + endString + s;

try {
return s.getBytes(response.getCharacterEncoding());
} catch (UnsupportedEncodingException e) {
logger.trace("", e);
}
Expand All @@ -142,7 +131,24 @@ public byte[] filter(AtmosphereResponse r, byte[] message, int offset, int lengt
}
return Action.CONTINUE;
}


private byte[] transform(byte[] input) throws UnsupportedEncodingException, CharacterCodingException{
return transform(input, 0, input.length);
}

private byte[] transform(byte[] input, int offset, int length) throws CharacterCodingException, UnsupportedEncodingException{
CharBuffer cb = decoder.decode(ByteBuffer.wrap(input, offset, length));
int size = cb.length();
CharBuffer cb2 = CharBuffer.wrap(Integer.toString(size) + endString);
ByteBuffer bb = ByteBuffer.allocate((cb2.length() + size) * 2);
encoder.encode(cb2, bb, false);
encoder.encode(cb, bb, false);
bb.flip();
byte[] b = new byte[bb.limit()];
bb.get(b);
return b;
}

@Override
public String toString() {
return " Track Message Size Interceptor using " + endString;
Expand Down