Fixed token change status operation.

The TokenService has been modified to ignore token change status
operation if the status is unchanged.

https://fedorahosted.org/pki/ticket/1684

1 files changed, 8 insertions, 0 deletions

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 1a447a73e..b3608aef2 100644
--- a/base/tps/src/org/dogtagpki/server/tps/rest/TokenService.java
+++ b/base/tps/src/org/dogtagpki/server/tps/rest/TokenService.java
@@ -541,6 +541,14 @@ public class TokenService extends PKIService implements TokenResource {
             tokenRecord = database.getRecord(tokenID);
             TokenStatus currentTokenStatus = getTokenStatus(tokenRecord);
             CMS.debug("TokenService.changeTokenStatus(): current status: " + currentTokenStatus);
+
+            if (currentTokenStatus == tokenStatus) {
+                CMS.debug("TokenService.changeTokenStatus(): no status change, no activity log generated");
+
+                TokenData tokenData = createTokenData(tokenRecord);
+                return createOKResponse(tokenData);
+            }
+
             msg = msg + " from " + currentTokenStatus + " to " + tokenStatus;
 
             // make sure transition is allowed