Merge "Turn libraries/pom.xml into an aggregator"

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / rpc / AbstractRequestContext.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/AbstractRequestContext.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/AbstractRequestContext.java
index be9304b4211183cfd29881ae63c5a349ccedcae1..ba5c569d2bb5d6aefef2b399fcdee6f4b645bb02 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/AbstractRequestContext.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/AbstractRequestContext.java
@@ -12,16 +12,22 @@ import com.google.common.util.concurrent.SettableFuture;
 import org.opendaylight.openflowplugin.api.openflow.device.RequestContext;
 import org.opendaylight.openflowplugin.api.openflow.device.Xid;
 import org.opendaylight.yangtools.yang.common.RpcResult;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 public abstract class AbstractRequestContext<T> implements RequestContext<T> {
     private final SettableFuture<RpcResult<T>> rpcResultFuture = SettableFuture.create();
     private final Xid xid;
     private long waitTimeout;
 
-    protected AbstractRequestContext(final Long xid) {
+    protected AbstractRequestContext(final Uint32 xid) {
         this.xid = xid == null ? null : new Xid(xid);
     }
 
+    @Deprecated
+    protected AbstractRequestContext(final Long xid) {
+        this.xid = xid == null ? null : new Xid(Uint32.valueOf(xid));
+    }
+
     @Override
     public final ListenableFuture<RpcResult<T>> getFuture() {
         return rpcResultFuture;