Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "BUG-650: Split out CommitCoordinationTask"
[controller.git]
/
opendaylight
/
config
/
config-manager
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
config
/
manager
/
impl
/
osgi
/
BlankTransactionServiceTracker.java
diff --git
a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/BlankTransactionServiceTracker.java
b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/BlankTransactionServiceTracker.java
index b115f1acd94ef837c8b7309be87a86e41e1fd195..2e2bf969a93203c3beb2f7a126e2f3f04b57bb17 100644
(file)
--- a/
opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/BlankTransactionServiceTracker.java
+++ b/
opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/BlankTransactionServiceTracker.java
@@
-25,7
+25,7
@@
import org.slf4j.LoggerFactory;
* functionality.
*/
public class BlankTransactionServiceTracker implements ServiceTrackerCustomizer<ModuleFactory, Object> {
* functionality.
*/
public class BlankTransactionServiceTracker implements ServiceTrackerCustomizer<ModuleFactory, Object> {
- private static final Logger LOG
GER
= LoggerFactory.getLogger(BlankTransactionServiceTracker.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BlankTransactionServiceTracker.class);
public static final int DEFAULT_MAX_ATTEMPTS = 10;
public static final int DEFAULT_MAX_ATTEMPTS = 10;
@@
-65,7
+65,7
@@
public class BlankTransactionServiceTracker implements ServiceTrackerCustomizer<
try {
// create transaction
CommitStatus commitStatus = blankTransaction.hit();
try {
// create transaction
CommitStatus commitStatus = blankTransaction.hit();
- LOG
GER
.debug("Committed blank transaction with status {}", commitStatus);
+ LOG.debug("Committed blank transaction with status {}", commitStatus);
return;
} catch (ConflictingVersionException e) {
lastException = e;
return;
} catch (ConflictingVersionException e) {
lastException = e;
@@
-76,7
+76,7
@@
public class BlankTransactionServiceTracker implements ServiceTrackerCustomizer<
throw new IllegalStateException(interruptedException);
}
} catch (ValidationException e) {
throw new IllegalStateException(interruptedException);
}
} catch (ValidationException e) {
- LOG
GER
.error("Validation exception while running blank transaction indicates programming error", e);
+ LOG.error("Validation exception while running blank transaction indicates programming error", e);
throw new RuntimeException("Validation exception while running blank transaction indicates programming error", e);
}
}
throw new RuntimeException("Validation exception while running blank transaction indicates programming error", e);
}
}