diff options
Diffstat (limited to 'base/tps/src/org')
3 files changed, 5 insertions, 5 deletions
diff --git a/base/tps/src/org/dogtagpki/server/tps/TPSSubsystem.java b/base/tps/src/org/dogtagpki/server/tps/TPSSubsystem.java index 008f61333..b0ffb7570 100644 --- a/base/tps/src/org/dogtagpki/server/tps/TPSSubsystem.java +++ b/base/tps/src/org/dogtagpki/server/tps/TPSSubsystem.java @@ -145,7 +145,7 @@ public class TPSSubsystem implements IAuthority, ISubsystem { /** * Return the allowed next states for a given token based on TPS configuration. * - * If the current state is TEMP_LOST, token will be allowed transition to either + * If the current state is SUSPENDED, token will be allowed transition to either * UNINITIALIZED or ACTIVE depending on whether the token has certificates. * * @param tokenRecord @@ -156,7 +156,7 @@ public class TPSSubsystem implements IAuthority, ISubsystem { TokenStatus currentState = tokenRecord.getTokenStatus(); Collection<TokenStatus> nextStates = allowedTransitions.get(currentState); - if (currentState == TokenStatus.TEMP_LOST) { + if (currentState == TokenStatus.SUSPENDED) { Collection<TokenStatus> ns = new LinkedHashSet<TokenStatus>(); diff --git a/base/tps/src/org/dogtagpki/server/tps/dbs/TokenRecord.java b/base/tps/src/org/dogtagpki/server/tps/dbs/TokenRecord.java index a1aef5720..80fd30eb8 100644 --- a/base/tps/src/org/dogtagpki/server/tps/dbs/TokenRecord.java +++ b/base/tps/src/org/dogtagpki/server/tps/dbs/TokenRecord.java @@ -258,7 +258,7 @@ public class TokenRecord extends DBRecord { return TokenStatus.DAMAGED; } else if ("onHold".equals(reason)) { - return TokenStatus.TEMP_LOST; + return TokenStatus.SUSPENDED; } } else if ("terminated".equals(status)) { diff --git a/base/tps/src/org/dogtagpki/server/tps/rest/TokenService.java b/base/tps/src/org/dogtagpki/server/tps/rest/TokenService.java index 46a3c12d6..cc68c8ad3 100644 --- a/base/tps/src/org/dogtagpki/server/tps/rest/TokenService.java +++ b/base/tps/src/org/dogtagpki/server/tps/rest/TokenService.java @@ -98,7 +98,7 @@ public class TokenService extends PKIService implements TokenResource { break; case TokenStatus.TOKEN_ACTIVE: - if (tokenRecord.getTokenStatus() == TokenStatus.TEMP_LOST) { + if (tokenRecord.getTokenStatus() == TokenStatus.SUSPENDED) { // unrevoke certs tps.tdb.unRevokeCertsByCUID(tokenRecord.getId(), ipAddress, remoteUser); } @@ -129,7 +129,7 @@ public class TokenService extends PKIService implements TokenResource { tps.tdb.revokeCertsByCUID(tokenRecord.getId(), "destroyed", ipAddress, remoteUser); break; - case TokenStatus.TOKEN_TEMP_LOST: + case TokenStatus.TOKEN_SUSPENDED: tokenRecord.setStatus("lost"); newStatus = "lost"; tokenRecord.setReason("onHold"); |