diff --git a/apps/streaming/java/src/net/i2p/client/streaming/Connection.java b/apps/streaming/java/src/net/i2p/client/streaming/Connection.java index 4770356a9d7bce7c84d92301bc9eb53eb61f9727..6d088a2efdf037e1c863e4269d9961fbef335277 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/Connection.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/Connection.java @@ -70,7 +70,7 @@ class Connection { /** Notify this on connection (or connection failure) */ private final Object _connectLock; /** how many messages have been resent and not yet ACKed? */ - private final AtomicInteger _activeResends = new AtomicInteger(0); + private final AtomicInteger _activeResends = new AtomicInteger(); private final ConEvent _connectionEvent; private final int _randomWait; private int _localPort; @@ -565,6 +565,7 @@ class Connection { void disconnect(boolean cleanDisconnect) { disconnect(cleanDisconnect, true); } + void disconnect(boolean cleanDisconnect, boolean removeFromConMgr) { synchronized (_connectLock) { _connectLock.notifyAll(); } if (_log.shouldLog(Log.DEBUG)) diff --git a/apps/streaming/java/src/net/i2p/client/streaming/I2PSocketFull.java b/apps/streaming/java/src/net/i2p/client/streaming/I2PSocketFull.java index c4675c172414861bc9061060375044235a3186dd..2031827705efd9b6cf55e4349ffd4fa54e053d7d 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/I2PSocketFull.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/I2PSocketFull.java @@ -21,7 +21,7 @@ class I2PSocketFull implements I2PSocket { private final Destination _remotePeer; private final Destination _localPeer; private volatile MessageChannel _channel; - private final AtomicBoolean _closed = new AtomicBoolean(false); + private final AtomicBoolean _closed = new AtomicBoolean(); public I2PSocketFull(Connection con, I2PAppContext context) { log = context.logManager().getLog(I2PSocketFull.class); diff --git a/apps/streaming/java/src/net/i2p/client/streaming/I2PSocketManagerFull.java b/apps/streaming/java/src/net/i2p/client/streaming/I2PSocketManagerFull.java index 58aaa0f2f9d706ea99c2187f814643350a50e278..c49c03a07fe18ab524a840770ed032be0ad6de03 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/I2PSocketManagerFull.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/I2PSocketManagerFull.java @@ -38,9 +38,9 @@ public class I2PSocketManagerFull implements I2PSocketManager { private final ConnectionOptions _defaultOptions; private long _acceptTimeout; private String _name; - private static final AtomicInteger __managerId = new AtomicInteger(0); + private static final AtomicInteger __managerId = new AtomicInteger(); private final ConnectionManager _connectionManager; - private final AtomicBoolean _isDestroyed = new AtomicBoolean(false); + private final AtomicBoolean _isDestroyed = new AtomicBoolean(); /** * How long to wait for the client app to accept() before sending back CLOSE? diff --git a/apps/streaming/java/src/net/i2p/client/streaming/MessageOutputStream.java b/apps/streaming/java/src/net/i2p/client/streaming/MessageOutputStream.java index ee361e5c30a4cfcbf8f781632cd9f4dc1bef6b50..663f9e366726f6dbc2de816a5d66adc4c4bb565a 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/MessageOutputStream.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/MessageOutputStream.java @@ -26,8 +26,8 @@ class MessageOutputStream extends OutputStream { private int _valid; private final Object _dataLock; private final DataReceiver _dataReceiver; - private final AtomicReference<IOException>_streamError = new AtomicReference<IOException>(null); - private final AtomicBoolean _closed = new AtomicBoolean(false); + private final AtomicReference<IOException>_streamError = new AtomicReference<IOException>(); + private final AtomicBoolean _closed = new AtomicBoolean(); private long _written; private int _writeTimeout; private ByteCache _dataCache; diff --git a/apps/streaming/java/src/net/i2p/client/streaming/PacketLocal.java b/apps/streaming/java/src/net/i2p/client/streaming/PacketLocal.java index 7a9d78f680b9a0ca7bc683e04963bc0bba31cb25..1597504ffd2935fab492937dc3d16c68e7b7b6eb 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/PacketLocal.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/PacketLocal.java @@ -30,7 +30,7 @@ class PacketLocal extends Packet implements MessageOutputStream.WriteStatus { /** LOCKING: this */ private long _ackOn; private long _cancelledOn; - private final AtomicInteger _nackCount = new AtomicInteger(0); + private final AtomicInteger _nackCount = new AtomicInteger(); private volatile boolean _retransmitted; private volatile SimpleTimer2.TimedEvent _resendEvent;