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

* NetDB: Fix NPE after client shutdown (ticket #1174)

Browse Source
This commit is contained in:
zzz
2014-01-25 15:08:56 +00:00
parent f9144f2fbf
commit ec8354860e
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
history.txt
View File

@@ -1,3 +1,10 @@
2014-01-25 zzz
* i2psnark: Lower threshold for auto-stop
* Installer: Update links
* NetDB: Fix NPE after client shutdown (ticket #1174)
* Router: Lower frequency for publishing stats
* Update: All updates via torrent
2014-01-25 zab
* Move OutNetMessage buffer preparation to the Writer threads
(Ticket #1184)

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 1;
public final static long BUILD = 2;
/** for example "-test" */
public final static String EXTRA = "";

8
router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java
View File

@@ -313,9 +313,11 @@ class IterativeSearchJob extends FloodSearchJob {
sess = MessageWrapper.generateSession(getContext(), _fromLocalDest);
else
sess = MessageWrapper.generateSession(getContext());
if (_log.shouldLog(Log.INFO))
_log.info(getJobId() + ": Requesting encrypted reply from " + peer + ' ' + sess.key + ' ' + sess.tag);
dlm.setReplySession(sess.key, sess.tag);
if (sess != null) {
if (_log.shouldLog(Log.INFO))
_log.info(getJobId() + ": Requesting encrypted reply from " + peer + ' ' + sess.key + ' ' + sess.tag);
dlm.setReplySession(sess.key, sess.tag);
} // else client went away, but send it anyway
}
outMsg = MessageWrapper.wrap(getContext(), dlm, ri);
// ElG can take a while so do a final check before we send it,