Code Review
/
aaf
/
authz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
changed to unmaintained
[aaf/authz.git]
/
auth
/
auth-core
/
src
/
main
/
java
/
org
/
onap
/
aaf
/
auth
/
server
/
AbsServiceStarter.java
diff --git
a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsServiceStarter.java
b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsServiceStarter.java
index
f09a4ff
..
af54935
100644
(file)
--- a/
auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsServiceStarter.java
+++ b/
auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsServiceStarter.java
@@
-40,7
+40,7
@@
import org.onap.aaf.misc.rosetta.env.RosettaEnv;
public abstract class AbsServiceStarter<ENV extends RosettaEnv, TRANS extends Trans> implements ServiceStarter {
private Registrar<ENV> registrar;
public abstract class AbsServiceStarter<ENV extends RosettaEnv, TRANS extends Trans> implements ServiceStarter {
private Registrar<ENV> registrar;
- private boolean do
_r
egister;
+ private boolean do
R
egister;
protected AbsService<ENV,TRANS> service;
protected String hostname;
protected final boolean secure;
protected AbsService<ENV,TRANS> service;
protected String hostname;
protected final boolean secure;
@@
-57,7
+57,7
@@
public abstract class AbsServiceStarter<ENV extends RosettaEnv, TRANS extends Tr
}
// do_register - this is used for specialty Debug Situations. Developer can create an Instance for a remote system
// for Debugging purposes without fear that real clients will start to call your debug instance
}
// do_register - this is used for specialty Debug Situations. Developer can create an Instance for a remote system
// for Debugging purposes without fear that real clients will start to call your debug instance
- do
_r
egister = !"TRUE".equalsIgnoreCase(access().getProperty("aaf_locate_no_register",null));
+ do
R
egister = !"TRUE".equalsIgnoreCase(access().getProperty("aaf_locate_no_register",null));
hostname = access().getProperty(Config.HOSTNAME, null);
if (hostname==null) {
try {
hostname = access().getProperty(Config.HOSTNAME, null);
if (hostname==null) {
try {
@@
-91,7
+91,7
@@
public abstract class AbsServiceStarter<ENV extends RosettaEnv, TRANS extends Tr
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
public void run() {
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
public void run() {
- absSS.access().printf(Level.INIT, "Shutting down %s:%s\n",absSS.service.app
_name, absSS.service.app_v
ersion);
+ absSS.access().printf(Level.INIT, "Shutting down %s:%s\n",absSS.service.app
Name, absSS.service.appV
ersion);
absSS.shutdown();
app.cancel(true);
}
absSS.shutdown();
app.cancel(true);
}
@@
-112,7
+112,7
@@
public abstract class AbsServiceStarter<ENV extends RosettaEnv, TRANS extends Tr
@SafeVarargs
public final synchronized void register(final Registrant<ENV> ... registrants) {
@SafeVarargs
public final synchronized void register(final Registrant<ENV> ... registrants) {
- if (do
_r
egister) {
+ if (do
R
egister) {
if (registrar==null) {
registrar = new Registrar<ENV>(env(),false);
}
if (registrar==null) {
registrar = new Registrar<ENV>(env(),false);
}
@@
-142,12
+142,12
@@
public abstract class AbsServiceStarter<ENV extends RosettaEnv, TRANS extends Tr
File status = new File("/opt/app/aaf/status/");
boolean deleted = false;
if(status.exists()) {
File status = new File("/opt/app/aaf/status/");
boolean deleted = false;
if(status.exists()) {
- int lastdot = service.app
_n
ame.lastIndexOf("aaf.");
+ int lastdot = service.app
N
ame.lastIndexOf("aaf.");
String fname;
if(lastdot<0) {
String fname;
if(lastdot<0) {
- fname = service.app
_n
ame + '-' + hostname;
+ fname = service.app
N
ame + '-' + hostname;
} else {
} else {
- fname = service.app
_n
ame.substring(lastdot).replace('.', '-')
+ fname = service.app
N
ame.substring(lastdot).replace('.', '-')
+ '-' + hostname;
}
status = new File(status, fname);
+ '-' + hostname;
}
status = new File(status, fname);
@@
-157,7
+157,7
@@
public abstract class AbsServiceStarter<ENV extends RosettaEnv, TRANS extends Tr
}
if(deleted) {
service.access.log(Level.INIT, "Deleted Status",status.getAbsolutePath());
}
if(deleted) {
service.access.log(Level.INIT, "Deleted Status",status.getAbsolutePath());
- } else {
+ } else
if(status.exists())
{
service.access.log(Level.INIT, "Status not deleted: ",status.getAbsolutePath());
}
service.destroy();
service.access.log(Level.INIT, "Status not deleted: ",status.getAbsolutePath());
}
service.destroy();