Skip to content

Commit 56f83de

Browse files
author
Ian Craggs
committed
Merge branch 'develop' of github.com:eclipse/paho.mqtt.java into develop
2 parents 2716d29 + d7765be commit 56f83de

3 files changed

Lines changed: 16 additions & 2 deletions

File tree

org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/MqttConnectionState.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ public void clearConnectionState() {
5353

5454

5555
public Integer getReceiveMaximum() {
56+
if (receiveMaximum == null) {
57+
return 65535;
58+
}
5659
return receiveMaximum;
5760
}
5861

org.eclipse.paho.mqttv5.common/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ public byte[] encodeProperties() throws MqttException {
336336
// Maximum QoS
337337
if (maximumQoS != null && validProperties.contains(MAXIMUM_QOS_IDENTIFIER)) {
338338
outputStream.write(MAXIMUM_QOS_IDENTIFIER);
339-
outputStream.writeShort(maximumQoS);
339+
outputStream.writeByte(maximumQoS);
340340
}
341341

342342
// Retain Available
@@ -476,7 +476,7 @@ public void decodeProperties(DataInputStream dis) throws IOException, MqttExcept
476476
} else if (identifier == TOPIC_ALIAS_IDENTIFIER) {
477477
topicAlias = (int) inputStream.readShort();
478478
} else if (identifier == MAXIMUM_QOS_IDENTIFIER) {
479-
maximumQoS = (int) inputStream.readShort();
479+
maximumQoS = inputStream.read();
480480
} else if (identifier == RETAIN_AVAILABLE_IDENTIFIER) {
481481
retainAvailable = inputStream.readBoolean();
482482
} else if (identifier == USER_DEFINED_PAIR_IDENTIFIER) {

start-broker.bat

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@echo off
2+
rem Simplified Windows version of start-broker.sh
3+
rem Moquitto broker not supported, only Python Interopability Broker
4+
echo "Installing and starting Python Interop Broker."
5+
if not exist "paho.mqtt.testing" (
6+
git clone https://github.com/eclipse/paho.mqtt.testing.git
7+
)
8+
copy "java_client_testing.conf" "paho.mqtt.testing/interoperability/java_client_testing.conf" /y
9+
cd paho.mqtt.testing/interoperability
10+
start python3 startbroker.py -c java_client_testing.conf
11+
cd ../..

0 commit comments

Comments
 (0)