Fix lead transaction cancellation

[mdsal.git] / dom / mdsal-dom-spi / src / main / java / org / opendaylight / mdsal / dom / spi / ForwardingDOMRpcResult.java

diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcResult.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcResult.java
index e2761ad5083cb2c73d875ddd380e554a1039d229..e96f822227c6ad53144122ab139269d6e02e6ca8 100644 (file)
--- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcResult.java
+++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/ForwardingDOMRpcResult.java
@@ -9,7 +9,8 @@ package org.opendaylight.mdsal.dom.spi;
 
 import com.google.common.collect.ForwardingObject;
 import java.util.Collection;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.mdsal.dom.api.DOMRpcResult;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
@@ -18,17 +19,18 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
  * Utility class which implements {@link DOMRpcResult} by forwarding all methods
  * to a backing instance.
  */
+@NonNullByDefault
 public abstract class ForwardingDOMRpcResult extends ForwardingObject implements DOMRpcResult {
     @Override
-    protected abstract @Nonnull DOMRpcResult delegate();
+    protected abstract DOMRpcResult delegate();
 
     @Override
-    public Collection<RpcError> getErrors() {
+    public Collection<? extends RpcError> getErrors() {
         return delegate().getErrors();
     }
 
     @Override
-    public NormalizedNode<?, ?> getResult() {
+    public @Nullable NormalizedNode getResult() {
         return delegate().getResult();
     }
 }