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

fix QueuedI2CPMessageReader not stopping; javadocs

Browse Source
This commit is contained in:
zzz
2010-12-04 22:27:24 +00:00
parent 0b2bc726df
commit 86de251691
3 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/src/net/i2p/data/i2cp/I2CPMessageReader.java
View File

@@ -68,7 +68,7 @@ public class I2CPMessageReader {
/**
* Have the already started reader pause its reading indefinitely
*
* @deprecated unused
*/
public void pauseReading() {
_reader.pauseRunner();
@@ -76,7 +76,7 @@ public class I2CPMessageReader {
/**
* Resume reading after a pause
*
* @deprecated unused
*/
public void resumeReading() {
_reader.resumeRunner();
@@ -131,10 +131,12 @@ public class I2CPMessageReader {
_stayAlive = true;
}
/** deprecated unused */
public void pauseRunner() {
_doRun = false;
}
/** deprecated unused */
public void resumeRunner() {
_doRun = true;
}
@@ -181,7 +183,8 @@ public class I2CPMessageReader {
cancelRunner();
}
}
if (!_doRun) {
// ??? unused
if (_stayAlive && !_doRun) {
// pause .5 secs when we're paused
try {
Thread.sleep(500);

9
core/java/src/net/i2p/internal/QueuedI2CPMessageReader.java
View File

@@ -26,6 +26,12 @@ public class QueuedI2CPMessageReader extends I2CPMessageReader {
super();
}
@Override
public void cancelRunner() {
super.cancelRunner();
_readerThread.interrupt();
}
@Override
public void run() {
while (_stayAlive) {
@@ -40,7 +46,8 @@ public class QueuedI2CPMessageReader extends I2CPMessageReader {
_listener.messageReceived(QueuedI2CPMessageReader.this, msg);
} catch (InterruptedException ie) {}
}
if (!_doRun) {
// ??? unused
if (_stayAlive && !_doRun) {
// pause .5 secs when we're paused
try {
Thread.sleep(500);

15
router/java/src/net/i2p/data/i2np/I2NPMessageReader.java
View File

@@ -56,16 +56,19 @@ public class I2NPMessageReader {
*
*/
public void startReading() { _readerThread.start(); }
/**
* Have the already started reader pause its reading indefinitely
*
* @deprecated unused
*/
public void pauseReading() { _reader.pauseRunner(); }
/**
* Resume reading after a pause
*
* @deprecated unused
*/
public void resumeReading() { _reader.resumeRunner(); }
/**
* Cancel reading.
*
@@ -106,8 +109,13 @@ public class I2NPMessageReader {
_stayAlive = true;
_handler = new I2NPMessageHandler(_context);
}
/** deprecated unused */
public void pauseRunner() { _doRun = false; }
/** deprecated unused */
public void resumeRunner() { _doRun = true; }
public void cancelRunner() {
_doRun = false;
_stayAlive = false;
@@ -153,7 +161,8 @@ public class I2NPMessageReader {
cancelRunner();
}
}
if (!_doRun) {
// ??? unused
if (_stayAlive && !_doRun) {
// pause .5 secs when we're paused
try { Thread.sleep(500); } catch (InterruptedException ie) {}
}