1 files changed, 38 insertions, 0 deletions
diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusRequest.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusRequest.java
new file mode 100644
index 00000000000..a0bedd678eb
--- /dev/null
+++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusRequest.java
@@ -0,0 +1,38 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.messagebus.jdisc;
+
+import com.yahoo.jdisc.Request;
+import com.yahoo.jdisc.service.CurrentContainer;
+import com.yahoo.messagebus.Message;
+
+import java.net.URI;
+
+/**
+ * @author Simon Thoresen Hult
+ */
+public class MbusRequest extends Request {
+
+    private final Message message;
+
+    public MbusRequest(CurrentContainer current, URI uri, Message msg) {
+        super(current, uri);
+        this.message = validateMessage(msg);
+    }
+
+    public MbusRequest(Request parent, URI uri, Message msg) {
+        super(parent, uri);
+        this.message = validateMessage(msg);
+    }
+
+    public Message getMessage() {
+        return message;
+    }
+
+    private Message validateMessage(Message msg) {
+        if (msg != null) {
+            return msg;
+        }
+        release();
+        throw new NullPointerException();
+    }
+}