Moved creation of NodeManager past the initialization of
root and userroot mappings
This commit is contained in:
parent
429b647aa5
commit
2f953f83df
1 changed files with 4 additions and 4 deletions
|
@ -87,7 +87,7 @@ public class Application extends UnicastRemoteObject implements IRemoteApp, IRep
|
||||||
}
|
}
|
||||||
|
|
||||||
public Application (String name, SystemProperties sysProps, SystemProperties sysDbProps, File home)
|
public Application (String name, SystemProperties sysProps, SystemProperties sysDbProps, File home)
|
||||||
throws RemoteException, DbException, IllegalArgumentException {
|
throws RemoteException, IllegalArgumentException {
|
||||||
|
|
||||||
if (name == null || name.trim().length() == 0)
|
if (name == null || name.trim().length() == 0)
|
||||||
throw new IllegalArgumentException ("Invalid application name: "+name);
|
throw new IllegalArgumentException ("Invalid application name: "+name);
|
||||||
|
@ -126,8 +126,6 @@ public class Application extends UnicastRemoteObject implements IRemoteApp, IRep
|
||||||
pwf = new File (appDir, "passwd");
|
pwf = new File (appDir, "passwd");
|
||||||
pwfile = new CryptFile (pwf, parentpwfile);
|
pwfile = new CryptFile (pwf, parentpwfile);
|
||||||
|
|
||||||
nmgr = new NodeManager (this, dbDir.getAbsolutePath (), props);
|
|
||||||
|
|
||||||
charset = props.getProperty ("charset", "ISO-8859-1");
|
charset = props.getProperty ("charset", "ISO-8859-1");
|
||||||
|
|
||||||
debug = "true".equalsIgnoreCase (props.getProperty ("debug"));
|
debug = "true".equalsIgnoreCase (props.getProperty ("debug"));
|
||||||
|
@ -152,7 +150,7 @@ public class Application extends UnicastRemoteObject implements IRemoteApp, IRep
|
||||||
xmlrpcAccess = new XmlRpcAccess (this);
|
xmlrpcAccess = new XmlRpcAccess (this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void start () {
|
public void start () throws DbException {
|
||||||
|
|
||||||
eval = new RequestEvaluator (this);
|
eval = new RequestEvaluator (this);
|
||||||
logEvent ("Starting evaluators for "+name);
|
logEvent ("Starting evaluators for "+name);
|
||||||
|
@ -184,6 +182,8 @@ public class Application extends UnicastRemoteObject implements IRemoteApp, IRep
|
||||||
userRootMapping = new DbMapping (this, "__userroot__", p);
|
userRootMapping = new DbMapping (this, "__userroot__", p);
|
||||||
rewireDbMappings ();
|
rewireDbMappings ();
|
||||||
|
|
||||||
|
nmgr = new NodeManager (this, dbDir.getAbsolutePath (), props);
|
||||||
|
|
||||||
worker = new Thread (this, "Worker-"+name);
|
worker = new Thread (this, "Worker-"+name);
|
||||||
worker.setPriority (Thread.NORM_PRIORITY+2);
|
worker.setPriority (Thread.NORM_PRIORITY+2);
|
||||||
worker.start ();
|
worker.start ();
|
||||||
|
|
Loading…
Add table
Reference in a new issue