From 9733bbcfd69af2fe7d2acce97b358456d0a7076b Mon Sep 17 00:00:00 2001 From: Eliran Bivas Date: Thu, 8 Sep 2016 15:42:07 +0300 Subject: [PATCH 1/2] Build using docker and docker-compose --- Dockerfile | 12 ++++++++++++ docker-compose.yml | 6 ++++++ 2 files changed, 18 insertions(+) create mode 100644 Dockerfile create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..9170698 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,12 @@ +FROM java:8-jdk + +RUN apt-get update && \ + apt-get install -y \ + build-essential \ + libtool \ + autoconf \ + git \ + libnuma-dev \ + librdmacm-dev && \ + rm -rf /var/lib/apt/lists/* + diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..8e081b3 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,6 @@ +jxio: + build: . + volumes: + - ${PWD}:/code + working_dir: /code + command: /bin/bash build.sh From 6525a3c945ddb1bbd169f947fbbbd67b6774f1c4 Mon Sep 17 00:00:00 2001 From: Eliran Bivas Date: Mon, 21 Nov 2016 10:52:59 +0200 Subject: [PATCH 2/2] check that polled message isn't null --- src/accelio | 2 +- src/java/org/accelio/jxio/MsgPool.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/accelio b/src/accelio index fd3c54c..fa09f5b 160000 --- a/src/accelio +++ b/src/accelio @@ -1 +1 @@ -Subproject commit fd3c54c907a3e5d5f218361e0a596930afe826e4 +Subproject commit fa09f5b876f06872e3a3727bae0ace000958eaa5 diff --git a/src/java/org/accelio/jxio/MsgPool.java b/src/java/org/accelio/jxio/MsgPool.java index 2bf4009..3832c25 100644 --- a/src/java/org/accelio/jxio/MsgPool.java +++ b/src/java/org/accelio/jxio/MsgPool.java @@ -140,7 +140,9 @@ public Msg getMsg() { return null; } Msg msg = listMsg.poll(); - msg.setMsgReturnable(); + if (msg != null) { + msg.setMsgReturnable(); + } return msg; }