dandri/i2p.i2p
1
0
Fork 0
mirror of https://github.com/i2p/i2p.i2p.git synced 2026-06-08 00:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Router: Fix rare NPE at startup in InNetMessagePool

Browse Source 
where netdb has not registered a DatabaseStoreMessage job builder.

- Add shortcut for DSRM and DeliveryStatus that do not have job builders.
- Log tweaks

reported by: postman
This commit is contained in:
zzz
2026-05-15 10:06:37 -04:00
parent 2bf04648c3
commit 1180597882
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
router/java/src/net/i2p/router/InNetMessagePool.java
+20 -5
View File
@@ -226,6 +226,12 @@ public class InNetMessagePool implements Service {
case DatabaseStoreMessage.MESSAGE_TYPE:
List<OutNetMessage> origMessages = _context.messageRegistry().getOriginalMessages(messageBody);
HandlerJobBuilder dsmbuilder = _handlerJobBuilders[DatabaseStoreMessage.MESSAGE_TYPE];
if (dsmbuilder == null) {
// startup, netdb not initialized yet
if (_log.shouldWarn())
_log.warn("No job builder for DSM yet");
break;
}
Job dsmjob = dsmbuilder.createJob(messageBody, fromRouter, fromRouterHash);
int sz = origMessages.size();
if (sz > 0) {
@@ -269,16 +275,19 @@ public class InNetMessagePool implements Service {
+ " message: " + messageBody);
break;
case DatabaseSearchReplyMessage.MESSAGE_TYPE:
case DeliveryStatusMessage.MESSAGE_TYPE:
// shortcut, these two are common and do not have handlerJobBuilders
break;
default:
// why don't we allow type 0? There used to be a message of type 0 long ago...
if ( (type > 0) && (type < _handlerJobBuilders.length) ) {
HandlerJobBuilder builder = _handlerJobBuilders[type];
if (_log.shouldLog(Log.DEBUG))
_log.debug("Add msg to the pool - builder: " + builder
+ " type: " + messageBody.getClass().getSimpleName());
if (builder != null) {
if (_log.shouldDebug())
_log.debug("Add msg to the pool - builder: " + builder
+ " type: " + messageBody.getClass().getSimpleName());
Job job = builder.createJob(messageBody, fromRouter,
fromRouterHash);
if (job != null) {
@@ -288,7 +297,13 @@ public class InNetMessagePool implements Service {
// job may have just executed inline
}
jobFound = true;
} else {
if (_log.shouldWarn())
_log.warn("No job builder for message type " + type);
}
} else {
if (_log.shouldWarn())
_log.warn("No job builder for message type " + type);
}
break;
} // switch