Merge branch 'master' into develop

eProsima · Jun 14, 2019 · 086a00b · 086a00b
2 parents 7c6f477 + 971e350
commit 086a00b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -14,6 +14,13 @@ RUN apt-get install -y \
             cmake \
             git
 
+# Java
+RUN apt install -y openjdk-8-jdk
+ENV JAVA_HOME "/usr/lib/jvm/java-8-openjdk-amd64/"
+
+# Gradle
+RUN apt-get install -y gradle
+
 RUN apt-get clean
 
 # Prepare Micro XRCE-DDS Agent workspace

diff --git a/src/cpp/datareader/DataReader.cpp b/src/cpp/datareader/DataReader.cpp
@@ -226,7 +226,6 @@ void DataReader::read_task(
             = std::chrono::steady_clock::now();
     const std::chrono::time_point<std::chrono::steady_clock> final_time
             = init_time + std::chrono::seconds(delivery_control.max_elapsed_time());
-
     std::vector<uint8_t> data;
     while (running_cond_ && !stop_cond)
     {