Skip to content

Commit 02fb470

Browse files
committed
Removing assert from WebSocketFrame and changing the order of handleActionComplete to improve in-flight message handling
Signed-off-by: James Sutton <james.sutton@uk.ibm.com>
1 parent 461d6c5 commit 02fb470

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/CommsCallback.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,12 @@ private void handleActionComplete(MqttToken token)
208208
synchronized (token) {
209209
// @TRACE 705=callback and notify for key={0}
210210
log.fine(CLASS_NAME, methodName, "705", new Object[] { token.internalTok.getKey() });
211+
if (token.isComplete()) {
212+
// Finish by doing any post processing such as delete
213+
// from persistent store but only do so if the action
214+
// is complete
215+
clientState.notifyComplete(token);
216+
}
211217

212218
// Unblock any waiters and if pending complete now set completed
213219
token.internalTok.notifyComplete();
@@ -232,12 +238,7 @@ private void handleActionComplete(MqttToken token)
232238
}
233239

234240

235-
if (token.isComplete()) {
236-
// Finish by doing any post processing such as delete
237-
// from persistent store but only do so if the action
238-
// is complete
239-
clientState.notifyComplete(token);
240-
}
241+
241242
}
242243
}
243244

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/websocket/WebSocketFrame.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ public byte[] encodeFrame(){
204204
*/
205205
public static void appendLengthAndMask(ByteBuffer buffer, int length, byte mask[]){
206206
if(mask != null){
207-
assert (mask.length ==4);
208207
appendLength(buffer, length, true);
209208
buffer.put(mask);
210209
} else {

0 commit comments

Comments
 (0)