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

Fixes #566: NotSerializableException: SessionRegistry$PublishedMessage #568

Closed
wants to merge 2 commits into from
Closed

Fixes #566: NotSerializableException: SessionRegistry$PublishedMessage #568

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb11a31
Fixes #566: NotSerializableException: SessionRegistry$PublishedMessage
hylkevds Feb 1, 2021
df2db8f
Fixed serialization of ByteBuf
hylkevds Feb 2, 2021
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
37 changes: 32 additions & 5 deletions broker/src/main/java/io/moquette/broker/SessionRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,12 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.net.InetSocketAddress;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Queue;
Expand All @@ -38,20 +41,44 @@

public class SessionRegistry {

public abstract static class EnqueuedMessage {
public abstract static class EnqueuedMessage implements Serializable {
}

static class PublishedMessage extends EnqueuedMessage {

final Topic topic;
final MqttQoS publishingQos;
final ByteBuf payload;
Topic topic;
MqttQoS publishingQos;
transient ByteBuf payload;

public PublishedMessage() {
this.topic = null;
this.publishingQos = null;
}

PublishedMessage(Topic topic, MqttQoS publishingQos, ByteBuf payload) {
this.topic = topic;
this.publishingQos = publishingQos;
this.payload = payload;
}

private void writeObject(ObjectOutputStream oos) throws IOException {
oos.defaultWriteObject();
byte[] byteArr = new byte[payload.readableBytes()];
ByteBuf copy = payload.copy();
copy.readBytes(byteArr);
copy.release();
oos.writeInt(byteArr.length);
oos.write(byteArr);
}

private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException {
ois.defaultReadObject();
int length = ois.readInt();
byte[] byteArr = new byte[length];
ois.read(byteArr);
payload = Unpooled.wrappedBuffer(byteArr);
}

}

static final class PubRelMarker extends EnqueuedMessage {
Expand Down