zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

javadoc, remove unneeded volatile and initializer in TCG

Browse Source
This commit is contained in:
zzz
2015-04-20 13:12:21 +00:00
parent ecfb3e94c8
commit a100d2ccf9
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java
View File

@@ -45,7 +45,7 @@ public class TunnelControllerGroup implements ClientApp {
private final List<TunnelController> _controllers; private final List<TunnelController> _controllers;
private final ReadWriteLock _controllersLock; private final ReadWriteLock _controllersLock;
private volatile boolean _controllersLoaded; private boolean _controllersLoaded;
private final Object _controllersLoadedLock = new Object(); private final Object _controllersLoadedLock = new Object();
private final String _configFile; private final String _configFile;
@@ -111,7 +111,6 @@ public class TunnelControllerGroup implements ClientApp {
_log = _context.logManager().getLog(TunnelControllerGroup.class); _log = _context.logManager().getLog(TunnelControllerGroup.class);
_controllers = new ArrayList<TunnelController>(); _controllers = new ArrayList<TunnelController>();
_controllersLock = new ReentrantReadWriteLock(true); _controllersLock = new ReentrantReadWriteLock(true);
_controllersLoaded = false;
if (args == null || args.length <= 0) if (args == null || args.length <= 0)
_configFile = DEFAULT_CONFIG_FILE; _configFile = DEFAULT_CONFIG_FILE;
else if (args.length == 1) else if (args.length == 1)
@@ -241,8 +240,10 @@ public class TunnelControllerGroup implements ClientApp {
} }
/** /**
* Load up all of the tunnels configured in the given file (but do not start * Load up all of the tunnels configured in the given file.
* them) * Prior to 0.9.20, also started the tunnels.
* As of 0.9.20, does not start the tunnels, you must call startup()
* or getInstance() instead of loadControllers().
* *
* DEPRECATED for use outside this class. Use startup() or getInstance(). * DEPRECATED for use outside this class. Use startup() or getInstance().
* *
@@ -279,6 +280,7 @@ public class TunnelControllerGroup implements ClientApp {
/** /**
* Start all of the tunnels. Must call loadControllers() first. * Start all of the tunnels. Must call loadControllers() first.
* @since 0.9.20
*/ */
private synchronized void startControllers() { private synchronized void startControllers() {
changeState(STARTING); changeState(STARTING);