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

initialization cleanup and finals

Browse Source
This commit is contained in:
zzz
2016-01-03 17:22:03 +00:00
parent a141d50902
commit ee1852f3a4
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
apps/sam/java/src/net/i2p/sam/SAMMessageSession.java
View File

@@ -36,8 +36,8 @@ import net.i2p.util.Log;
abstract class SAMMessageSession implements Closeable { abstract class SAMMessageSession implements Closeable {
protected final Log _log; protected final Log _log;
private I2PSession session; private final I2PSession session;
private SAMMessageSessionHandler handler; private final SAMMessageSessionHandler handler;
/** /**
* Initialize a new SAM message-based session. * Initialize a new SAM message-based session.
@@ -49,9 +49,7 @@ abstract class SAMMessageSession implements Closeable {
* @throws I2PSessionException * @throws I2PSessionException
*/ */
protected SAMMessageSession(String dest, Properties props) throws IOException, DataFormatException, I2PSessionException { protected SAMMessageSession(String dest, Properties props) throws IOException, DataFormatException, I2PSessionException {
_log = I2PAppContext.getGlobalContext().logManager().getLog(getClass()); this(new ByteArrayInputStream(Base64.decode(dest)), props);
ByteArrayInputStream bais = new ByteArrayInputStream(Base64.decode(dest));
initSAMMessageSession(bais, props);
} }
/** /**
@@ -64,16 +62,12 @@ abstract class SAMMessageSession implements Closeable {
* @throws I2PSessionException * @throws I2PSessionException
*/ */
protected SAMMessageSession(InputStream destStream, Properties props) throws IOException, DataFormatException, I2PSessionException { protected SAMMessageSession(InputStream destStream, Properties props) throws IOException, DataFormatException, I2PSessionException {
_log = new Log(getClass()); _log = I2PAppContext.getGlobalContext().logManager().getLog(getClass());
initSAMMessageSession(destStream, props);
}
private void initSAMMessageSession (InputStream destStream, Properties props) throws IOException, DataFormatException, I2PSessionException {
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug("Initializing SAM message-based session"); _log.debug("Initializing SAM message-based session");
handler = new SAMMessageSessionHandler(destStream, props); handler = new SAMMessageSessionHandler(destStream, props);
session = handler.getSession();
// FIXME don't start threads in constructors // FIXME don't start threads in constructors
Thread t = new I2PAppThread(handler, "SAMMessageSessionHandler"); Thread t = new I2PAppThread(handler, "SAMMessageSessionHandler");
t.start(); t.start();
@@ -196,6 +190,7 @@ abstract class SAMMessageSession implements Closeable {
*/ */
class SAMMessageSessionHandler implements Runnable, I2PSessionMuxedListener { class SAMMessageSessionHandler implements Runnable, I2PSessionMuxedListener {
private final I2PSession _session;
private final Object runningLock = new Object(); private final Object runningLock = new Object();
private volatile boolean stillRunning = true; private volatile boolean stillRunning = true;
@@ -215,15 +210,23 @@ abstract class SAMMessageSession implements Closeable {
props.setProperty("inbound.nickname", "SAM UDP Client"); props.setProperty("inbound.nickname", "SAM UDP Client");
props.setProperty("outbound.nickname", "SAM UDP Client"); props.setProperty("outbound.nickname", "SAM UDP Client");
} }
session = client.createSession(destStream, props); _session = client.createSession(destStream, props);
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug("Connecting I2P session..."); _log.debug("Connecting I2P session...");
session.connect(); _session.connect();
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug("I2P session connected"); _log.debug("I2P session connected");
session.addMuxedSessionListener(this, I2PSession.PROTO_ANY, I2PSession.PORT_ANY); _session.addMuxedSessionListener(this, I2PSession.PROTO_ANY, I2PSession.PORT_ANY);
}
/**
* The session.
* @since 0.9.25
*/
public final I2PSession getSession() {
return _session;
} }
/** /**