ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-30 01:48:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Throw exceptions in java server start for any failures

Browse Source
This commit is contained in:
Jeremy Lakeman 2016-04-11 13:36:35 +09:30
parent 7939a780fb
commit 206f06f3f9
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server.c
View File

@ -157,9 +157,9 @@ JNIEXPORT jint JNICALL Java_org_servalproject_servaldna_ServalDCommand_server(
int pid = server_pid(); int pid = server_pid();
if (pid < 0) if (pid < 0)
return -1; return Throw(env, "java/lang/IllegalStateException", "Failed to read server pid "+pid);
if (pid>0) if (pid>0)
return 1; return Throw(env, "java/lang/IllegalStateException", "Server already running on pid "+pid);
cf_reload_strict(); cf_reload_strict();
@ -192,20 +192,26 @@ JNIEXPORT jint JNICALL Java_org_servalproject_servaldna_ServalDCommand_server(
} }
} }
if (keyring_seed(keyring) == -1) if (keyring_seed(keyring) == -1){
Throw(env, "java/lang/IllegalStateException", "Failed to seed keyring");
goto end; goto end;
}
if (server_env) if (server_env){
Throw(env, "java/lang/IllegalStateException", "Server java env variable already set");
goto end; goto end;
}
server_env = env; server_env = env;
JniCallback = (*env)->NewGlobalRef(env, callback); JniCallback = (*env)->NewGlobalRef(env, callback);
ret = server_bind(); ret = server_bind();
if (ret==-1) if (ret==-1){
Throw(env, "java/lang/IllegalStateException", "Failed to bind sockets");
goto end; goto end;
}
{ {
jstring str = (jstring)(*env)->NewStringUTF(env, instance_path()); jstring str = (jstring)(*env)->NewStringUTF(env, instance_path());
(*env)->CallVoidMethod(env, callback, started, str, getpid(), mdp_loopback_port, httpd_server_port); (*env)->CallVoidMethod(env, callback, started, str, getpid(), mdp_loopback_port, httpd_server_port);