Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG-650: Split out CommitCoordinationTask
[controller.git]
/
opendaylight
/
config
/
config-persister-feature-adapter
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
configpusherfeature
/
internal
/
AbstractFeatureWrapper.java
diff --git
a/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/AbstractFeatureWrapper.java
b/opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/AbstractFeatureWrapper.java
index 1bf2025c46ee3af3085f77ab6fdf166a54b71846..3e004b4d7cf03a99a7bcfb4e2906f0c437fadf73 100644
(file)
--- a/
opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/AbstractFeatureWrapper.java
+++ b/
opendaylight/config/config-persister-feature-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/AbstractFeatureWrapper.java
@@
-30,7
+30,7
@@
import com.google.common.base.Preconditions;
* Delegates the the contained feature and provides additional methods.
*/
public class AbstractFeatureWrapper implements Feature {
* Delegates the the contained feature and provides additional methods.
*/
public class AbstractFeatureWrapper implements Feature {
- private static final Logger
logger
= LoggerFactory.getLogger(AbstractFeatureWrapper.class);
+ private static final Logger
LOGGER
= LoggerFactory.getLogger(AbstractFeatureWrapper.class);
protected Feature feature = null;
protected AbstractFeatureWrapper() {
protected Feature feature = null;
protected AbstractFeatureWrapper() {
@@
-55,7
+55,7
@@
public class AbstractFeatureWrapper implements Feature {
try {
snapShotHolders.add(new FeatureConfigSnapshotHolder(c,this));
} catch (JAXBException e) {
try {
snapShotHolders.add(new FeatureConfigSnapshotHolder(c,this));
} catch (JAXBException e) {
-
logger
.debug("{} is not a config subsystem config file",c.getFinalname());
+
LOGGER
.debug("{} is not a config subsystem config file",c.getFinalname());
}
}
return snapShotHolders;
}
}
return snapShotHolders;
@@
-71,18
+71,23
@@
public class AbstractFeatureWrapper implements Feature {
@Override
public boolean equals(Object obj) {
@Override
public boolean equals(Object obj) {
- if (this == obj)
+ if (this == obj)
{
return true;
return true;
- if (obj == null)
+ }
+ if (obj == null) {
return false;
return false;
- if (getClass() != obj.getClass())
+ }
+ if (getClass() != obj.getClass()) {
return false;
return false;
+ }
AbstractFeatureWrapper other = (AbstractFeatureWrapper) obj;
if (feature == null) {
AbstractFeatureWrapper other = (AbstractFeatureWrapper) obj;
if (feature == null) {
- if (other.feature != null)
+ if (other.feature != null)
{
return false;
return false;
- } else if (!feature.equals(other.feature))
+ }
+ } else if (!feature.equals(other.feature)) {
return false;
return false;
+ }
return true;
}
return true;
}