Merge pull request TooTallNate#321 from mpbarnwell/patch-1

BrushfireDigitalServices · BrushfireDigitalServices · commit 06c3c75d89d3 · 2015-07-15T18:48:21.000-06:00
AtomicBoolean shouldn't be volatile
diff --git a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/main/java/org/java_websocket/server/WebSocketServer.java
@@ -77,14 +77,14 @@ public abstract class WebSocketServer extends WebSocketAdapter implements Runnab
 
 	private Thread selectorthread;
 
-	private volatile AtomicBoolean isclosed = new AtomicBoolean( false );
+	private final AtomicBoolean isclosed = new AtomicBoolean( false );
 
 	private List<WebSocketWorker> decoders;
 
 	private List<WebSocketImpl> iqueue;
 	private BlockingQueue<ByteBuffer> buffers;
 	private int queueinvokes = 0;
-	private AtomicInteger queuesize = new AtomicInteger( 0 );
+	private final AtomicInteger queuesize = new AtomicInteger( 0 );
 
 	private WebSocketServerFactory wsf = new DefaultWebSocketServerFactory();
 

-Original file line number
+Diff line change
 privateThreadselectorthread;
 -privatevolatileAtomicBooleanisclosed = newAtomicBoolean( false );
 +privatefinalAtomicBooleanisclosed = newAtomicBoolean( false );
 privateList<WebSocketWorker> decoders;
 privateList<WebSocketImpl> iqueue;
 privateBlockingQueue<ByteBuffer> buffers;
 privateintqueueinvokes = 0;
 -privateAtomicIntegerqueuesize = newAtomicInteger( 0 );
 +privatefinalAtomicIntegerqueuesize = newAtomicInteger( 0 );
 privateWebSocketServerFactorywsf = newDefaultWebSocketServerFactory();