Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix CS warnings in sal-clustering-commons and enable enforcement
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
OperationLimiter.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/OperationLimiter.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/OperationLimiter.java
index 34a7ebf8f233f8ab3d14c57e3e63b17357035028..c035790a94596b77dad9fc0ce83ca338f36c686a 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/OperationLimiter.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/OperationLimiter.java
@@
-12,7
+12,7
@@
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import com.google.common.base.Preconditions;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-import org.opendaylight.controller.cluster.
datastore.identifier
s.TransactionIdentifier;
+import org.opendaylight.controller.cluster.
access.concept
s.TransactionIdentifier;
import org.opendaylight.controller.cluster.datastore.messages.BatchedModificationsReply;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.opendaylight.controller.cluster.datastore.messages.BatchedModificationsReply;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@
-28,7
+28,7
@@
public class OperationLimiter extends OnComplete<Object> {
private final Semaphore semaphore;
private final int maxPermits;
private final Semaphore semaphore;
private final int maxPermits;
- OperationLimiter(final TransactionIdentifier identifier, final int maxPermits, final
int
acquireTimeoutSeconds) {
+ OperationLimiter(final TransactionIdentifier identifier, final int maxPermits, final
long
acquireTimeoutSeconds) {
this.identifier = Preconditions.checkNotNull(identifier);
Preconditions.checkArgument(acquireTimeoutSeconds >= 0);
this.identifier = Preconditions.checkNotNull(identifier);
Preconditions.checkArgument(acquireTimeoutSeconds >= 0);
@@
-71,14
+71,14
@@
public class OperationLimiter extends OnComplete<Object> {
}
@VisibleForTesting
}
@VisibleForTesting
- int availablePermits(){
+ int availablePermits()
{
return semaphore.availablePermits();
}
/**
return semaphore.availablePermits();
}
/**
- * Release all the permits
+ * Release all the permits
.
*/
public void releaseAll() {
*/
public void releaseAll() {
- this.semaphore.release(maxPermits
-
availablePermits());
+ this.semaphore.release(maxPermits
-
availablePermits());
}
}
}
}