Skip to content

Commit 8efeafb

Browse files
committed
Makes fields used for synchronization final
While these fields don't change on this code and, therefore, the synchronization should be safe, adding marking them as final adds one extra layer of protection to ensure their references won't be mistakenly reassigned in future code changes Signed-off-by: Otavio R. Piske <angusyoung@gmail.com>
1 parent f30e10b commit 8efeafb

29 files changed

Lines changed: 41 additions & 41 deletions

File tree

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/BasicTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ public void test402a() throws Exception {
502502
*/
503503
class MessageListener implements MqttCallback {
504504

505-
ArrayList<MqttMessage> messages;
505+
final ArrayList<MqttMessage> messages;
506506

507507
public MessageListener() {
508508
messages = new ArrayList<MqttMessage>();

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/LiveTakeOverTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public void testLiveTakeOver() throws Exception {
193193
class FirstClient implements Runnable {
194194

195195
private FirstClientState state = FirstClientState.INITIAL;
196-
public Object stateLock = new Object();
196+
public final Object stateLock = new Object();
197197
IMqttClient mqttClient = null;
198198
MqttV3Receiver mqttV3Receiver = null;
199199

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/PerSubscriptionMessageHandlerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public static void tearDownAfterClass() throws Exception {
9393

9494
class listener implements IMqttMessageListener {
9595

96-
ArrayList<MqttMessage> messages;
96+
final ArrayList<MqttMessage> messages;
9797

9898
public listener() {
9999
messages = new ArrayList<MqttMessage>();

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/SendReceiveAsyncCallbackTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public void onFailure(IMqttToken asyncActionToken, Throwable exception) {
128128

129129
class listener implements IMqttMessageListener {
130130

131-
ArrayList<MqttMessage> messages;
131+
final ArrayList<MqttMessage> messages;
132132

133133
public listener() {
134134
messages = new ArrayList<MqttMessage>();

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/WebSocketTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ public void testBasicAuth() throws Exception {
306306
*/
307307
class MessageListener implements MqttCallback {
308308

309-
ArrayList<MqttMessage> messages;
309+
final ArrayList<MqttMessage> messages;
310310

311311
public MessageListener() {
312312
messages = new ArrayList<MqttMessage>();

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/utilities/ConnectionManipulationProxyServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class ConnectionManipulationProxyServer implements Runnable {
1616
private String host;
1717
private int remotePort;
1818
private Thread proxyThread;
19-
private Object enableLock = new Object();
19+
private final Object enableLock = new Object();
2020
private boolean enableProxy = true;
2121
private boolean running = true;
2222
Socket client = null, server = null;

org.eclipse.paho.client.mqttv3/src/main/java-templates/org/eclipse/paho/client/mqttv3/internal/ClientComms.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public class ClientComms {
7979
private boolean stoppingComms = false;
8080

8181
private byte conState = DISCONNECTED;
82-
private Object conLock = new Object(); // Used to synchronize connection state
82+
private final Object conLock = new Object(); // Used to synchronize connection state
8383
private boolean closePending = false;
8484
private boolean resting = false;
8585
private DisconnectedMessageBuffer disconnectedMessageBuffer;

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/MqttAsyncClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public class MqttAsyncClient implements IMqttAsyncClient {
111111
private static int reconnectDelay = 1000; // Reconnect delay, starts at 1
112112
// second
113113
private boolean reconnecting = false;
114-
private static Object clientLock = new Object(); // Simple lock
114+
private static final Object clientLock = new Object(); // Simple lock
115115

116116
private ScheduledExecutorService executorService;
117117

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,15 +127,15 @@ public class ClientState {
127127
private int actualInFlight = 0;
128128
private int inFlightPubRels = 0;
129129

130-
private Object queueLock = new Object();
131-
private Object quiesceLock = new Object();
130+
private final Object queueLock = new Object();
131+
private final Object quiesceLock = new Object();
132132
private boolean quiescing = false;
133133

134134
private long lastOutboundActivity = 0;
135135
private long lastInboundActivity = 0;
136136
private long lastPing = 0;
137137
private MqttWireMessage pingCommand;
138-
private Object pingOutstandingLock = new Object();
138+
private final Object pingOutstandingLock = new Object();
139139
private int pingOutstanding = 0;
140140

141141
private boolean connected = false;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,19 @@ public class CommsCallback implements Runnable {
5454
private MqttCallbackExtended reconnectInternalCallback;
5555
private Hashtable<String, IMqttMessageListener> callbacks; // topicFilter -> messageHandler
5656
private ClientComms clientComms;
57-
private Vector<MqttWireMessage> messageQueue;
58-
private Vector<MqttToken> completeQueue;
57+
private final Vector<MqttWireMessage> messageQueue;
58+
private final Vector<MqttToken> completeQueue;
5959

6060
private enum State {STOPPED, RUNNING, QUIESCING};
6161
private State current_state = State.STOPPED;
6262
private State target_state = State.STOPPED;
63-
private Object lifecycle = new Object();
63+
private final Object lifecycle = new Object();
6464
private Thread callbackThread;
6565
private String threadName;
6666
private Future<?> callbackFuture;
6767

68-
private Object workAvailable = new Object();
69-
private Object spaceAvailable = new Object();
68+
private final Object workAvailable = new Object();
69+
private final Object spaceAvailable = new Object();
7070
private ClientState clientState;
7171
private boolean manualAcks = false;
7272

0 commit comments

Comments
 (0)