diff options
Diffstat (limited to 'auth/auth-core')
-rw-r--r-- | auth/auth-core/src/main/java/org/onap/aaf/auth/org/Organization.java | 10 | ||||
-rw-r--r-- | auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsServiceStarter.java | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/org/Organization.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/org/Organization.java index 597f2696..539b9369 100644 --- a/auth/auth-core/src/main/java/org/onap/aaf/auth/org/Organization.java +++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/org/Organization.java @@ -106,18 +106,16 @@ public interface Organization { public Identity getIdentity(AuthzTrans trans, String id) throws OrganizationException; /** - * May AutoDelete + * Is Revoked * * Deletion of an Identity that has been removed from an Organization can be dangerous. Mistakes may have been made * in the Organization side, a Feed might be corrupted, an API might not be quite right. * - * The implementation of this method can use a double check of some sort, such as comparsion of missing ID in Organization + * The implementation of this method can use a double check of some sort, such as comparison of missing ID in Organization * feed with a "Deleted ID" feed. * - * The failure to be in Organization will still be reported, if returned "false", but if true, it is taken as an - * ok to proceed with deletion. */ - public boolean mayAutoDelete(AuthzTrans trans, String id); + public boolean isRevoked(AuthzTrans trans, String id); /** @@ -562,7 +560,7 @@ public interface Organization { } @Override - public boolean mayAutoDelete(AuthzTrans trans, String id) { + public boolean isRevoked(AuthzTrans trans, String id) { // provide a corresponding feed that indicates that an ID has been intentionally removed from identities.dat table. return false; } 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 ee92540b..b3e2883d 100644 --- 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 @@ -148,7 +148,7 @@ public abstract class AbsServiceStarter<ENV extends RosettaEnv, TRANS extends Tr } status = new File(status, fname); if(status.exists()) { - status.delete(); + deleted=status.delete(); } } if(deleted) { |