Code Review
/
mdsal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix SnapshotBackedWriteTransaction error message
[mdsal.git]
/
dom
/
mdsal-dom-spi
/
src
/
main
/
java
/
org
/
opendaylight
/
mdsal
/
dom
/
spi
/
store
/
SnapshotBackedWriteTransaction.java
diff --git
a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedWriteTransaction.java
b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedWriteTransaction.java
index 0d79b6508393833cd8ee1f097de4bbe39f760a23..99f60497d81d0469b84150b1bafff614508f5ae4 100644
(file)
--- a/
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedWriteTransaction.java
+++ b/
dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedWriteTransaction.java
@@
-15,7
+15,7
@@
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Throwables;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
import com.google.common.base.Throwables;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
-import
javax
.annotation.Nullable;
+import
org.eclipse.jdt
.annotation.Nullable;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
@@
-92,7
+92,7
@@
public class SnapshotBackedWriteTransaction<T> extends AbstractDOMStoreTransacti
tree.merge(path, data);
// FIXME: Add checked exception
} catch (Exception e) {
tree.merge(path, data);
// FIXME: Add checked exception
} catch (Exception e) {
- LOG.error("Tx: {}, failed to
writ
e {}:{} in {}", getIdentifier(), path, data, tree, e);
+ LOG.error("Tx: {}, failed to
merg
e {}:{} in {}", getIdentifier(), path, data, tree, e);
// Rethrow original ones if they are subclasses of RuntimeException or Error
Throwables.throwIfUnchecked(e);
// FIXME: Introduce proper checked exception
// Rethrow original ones if they are subclasses of RuntimeException or Error
Throwables.throwIfUnchecked(e);
// FIXME: Introduce proper checked exception