X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FFrontendReadWriteTransaction.java;h=45edfc9333d9530b347e735756e48fc81c678b08;hp=9f1df4c8ab31b45fdea9d47bf7c11ddc20c25331;hb=d9e3fa9b7d4f1ad484931151c3b3ef237a674ab2;hpb=1ddc826aa07a84f94b318499b862cafb9ae1b3c8 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendReadWriteTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendReadWriteTransaction.java index 9f1df4c8ab..45edfc9333 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendReadWriteTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendReadWriteTransaction.java @@ -84,7 +84,7 @@ final class FrontendReadWriteTransaction extends FrontendTransaction { // Sequence has already been checked @Override - @Nullable TransactionSuccess handleRequest(final TransactionRequest request, final RequestEnvelope envelope, + @Nullable TransactionSuccess doHandleRequest(final TransactionRequest request, final RequestEnvelope envelope, final long now) throws RequestException { if (request instanceof ModifyTransactionRequest) { return handleModifyTransaction((ModifyTransactionRequest) request, envelope, now); @@ -297,7 +297,7 @@ final class FrontendReadWriteTransaction extends FrontendTransaction { } else if (m instanceof TransactionMerge) { modification.merge(m.getPath(), ((TransactionMerge) m).getData()); } else { - LOG.warn("{}: ignoring unhandled modification {}", history().persistenceId(), m); + LOG.warn("{}: ignoring unhandled modification {}", persistenceId(), m); } } } @@ -324,7 +324,7 @@ final class FrontendReadWriteTransaction extends FrontendTransaction { coordinatedCommit(envelope, now); return null; default: - LOG.warn("{}: rejecting unsupported protocol {}", history().persistenceId(), maybeProto.get()); + LOG.warn("{}: rejecting unsupported protocol {}", persistenceId(), maybeProto.get()); throw new UnsupportedRequestException(request); } } @@ -334,7 +334,7 @@ final class FrontendReadWriteTransaction extends FrontendTransaction { // only once. if (readyCohort == null) { readyCohort = openTransaction.ready(); - LOG.debug("{}: transitioned {} to ready", history().persistenceId(), openTransaction.getIdentifier()); + LOG.debug("{}: transitioned {} to ready", persistenceId(), openTransaction.getIdentifier()); openTransaction = null; } }