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 1894: Add LISP configuration options to etc/custom.properties in Karaf"
[controller.git]
/
opendaylight
/
md-sal
/
sal-common-api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
md
/
sal
/
common
/
api
/
data
/
OptimisticLockFailedException.java
diff --git
a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/OptimisticLockFailedException.java
b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/OptimisticLockFailedException.java
index 222289ab6cb967396478a67869dbb11cf6689903..5ddec6b1edfcec9c76425d8587bc989abf3d897f 100644
(file)
--- a/
opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/OptimisticLockFailedException.java
+++ b/
opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/OptimisticLockFailedException.java
@@
-1,5
+1,8
@@
package org.opendaylight.controller.md.sal.common.api.data;
package org.opendaylight.controller.md.sal.common.api.data;
+import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
+
/**
*
* Failure of asynchronous transaction commit caused by failure
/**
*
* Failure of asynchronous transaction commit caused by failure
@@
-18,17
+21,13
@@
public class OptimisticLockFailedException extends TransactionCommitFailedExcept
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
- protected OptimisticLockFailedException(final String message, final Throwable cause, final boolean enableSuppression,
- final boolean writableStackTrace) {
- super(message, cause, enableSuppression, writableStackTrace);
- }
-
public OptimisticLockFailedException(final String message, final Throwable cause) {
public OptimisticLockFailedException(final String message, final Throwable cause) {
- super(message, cause);
+ super(message, cause, RpcResultBuilder.newError(ErrorType.APPLICATION, "resource-denied",
+ message, null, null, cause));
}
public OptimisticLockFailedException(final String message) {
}
public OptimisticLockFailedException(final String message) {
-
super(message
);
+
this(message, null
);
}
}
}
}