Author: mduerig
Date: Thu Nov 3 15:42:39 2016
New Revision: 1767908
URL: http://svn.apache.org/viewvc?rev=1767908&view=rev
Log:
OAK-5055: o.a.j.o.s.s.RevisionGC returns status that don't comply with the API
Return correct status
Credits to Timothee Maret for the patch
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/RevisionGC.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/RevisionGC.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/RevisionGC.java?rev=1767908&r1=1767907&r2=1767908&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/RevisionGC.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/RevisionGC.java
Thu Nov 3 15:42:39 2016
@@ -21,7 +21,7 @@ package org.apache.jackrabbit.oak.spi.st
import static com.google.common.base.Preconditions.checkNotNull;
import static
org.apache.jackrabbit.oak.management.ManagementOperation.Status.failed;
-import static
org.apache.jackrabbit.oak.management.ManagementOperation.Status.succeeded;
+import static
org.apache.jackrabbit.oak.management.ManagementOperation.Status.initiated;
import static org.apache.jackrabbit.oak.management.ManagementOperation.done;
import static
org.apache.jackrabbit.oak.management.ManagementOperation.newManagementOperation;
@@ -102,7 +102,7 @@ public class RevisionGC implements Revis
}
});
executor.execute(gcOp);
- return succeeded(OP_NAME + " started").toCompositeData();
+ return initiated(OP_NAME + " started").toCompositeData();
} else {
return failed(OP_NAME + " already running").toCompositeData();
}
@@ -120,7 +120,7 @@ public class RevisionGC implements Revis
return null;
}
}));
- return succeeded("Revision garbage collection
cancelled").toCompositeData();
+ return initiated("Revision garbage collection
cancelled").toCompositeData();
} else {
return failed(OP_NAME + " not running").toCompositeData();
}