I2P_Developers/i2p.syndie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

- Fix NPE in login script when using TextUI as main class

Browse Source 
- Fix another early NPE in CLI
This commit is contained in:
zzz
2013-01-09 18:09:40 +00:00
parent a80fbe8e9c
commit ddaeaa0711
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/syndie/db/TextEngine.java
View File

@ -42,7 +42,10 @@ public class TextEngine {
private List _scriptListeners;
private boolean _newNymCreated;
/** CLI only, will instantiate DBClient */
public TextEngine(String rootDir, UI ui) { this(rootDir, ui, null); }
/** CLI only, will instantiate DBClient */
public TextEngine(String rootDir, UI ui, ScriptListener lsnr) {
_scriptListeners = new ArrayList();
if (lsnr != null)
@ -55,11 +58,15 @@ public class TextEngine {
_newNymCreated = false;
_commandHistory = new ArrayList();
rebuildMenus();
// this instantiates DBClient in CLI-only mode
buildInstallDir();
_client.runScript(_ui, "startup");
}
/** CLI helper under GUI */
public TextEngine(DBClient client, UI ui) { this(client, ui, null); }
/** CLI helper under GUI */
public TextEngine(DBClient client, UI ui, ScriptListener lsnr) {
_scriptListeners = new ArrayList();
if (lsnr != null)
@ -170,6 +177,9 @@ public class TextEngine {
rebuildMenus();
}
/**
* This also instantiates the DBClient in CLI-only mode
*/
private void buildInstallDir() {
_rootDir = new SecureFile(_rootFile);
_dbDir = new SecureFile(_rootDir, "db");
@ -220,9 +230,12 @@ public class TextEngine {
if (!f.exists())
installResource("/archive/robots.txt", f);
if (_client == null)
if (_client == null) {
_client = new DBClient(I2PAppContext.getGlobalContext(), _rootDir);
// required to prevent NPE when running startup scripts
_client.setDefaultUI(_ui);
}
if (dbDirCreated) {
// so it doesn't gather 'command completed'/etc messages on the screen
_ui.insertCommand("gobble");

5
src/syndie/db/ThreadAccumulator.java
View File

@ -323,8 +323,11 @@ AND
for (int i = 0; i < rootMsgIds.size(); i++) {
Long msgId = (Long)rootMsgIds.get(i);
MessageThreadBuilder builder = new MessageThreadBuilder(_client, _ui);
MessageInfo info = _client.getMessage(msgId.longValue());
if (info == null) // startup maybe?
continue;
//_ui.debugMessage("building thread for root msgId: " + msgId);
ReferenceNode root = builder.buildThread(_client.getMessage(msgId.longValue()));
ReferenceNode root = builder.buildThread(info);
_ui.debugMessage("thread built for root msgId: " + msgId + " - " + (root != null ? root.getURI() : null));
// loads up the details (tags, etc), and if the thread matches the
// criteria, the details are added to _rootURIs, _threadMessages, etc