From 88a8169f4d486f456c3c76071cd55948c5a23a0d Mon Sep 17 00:00:00 2001
From: Sonia Minolli <sonia.minolli@synchrotron-soleil.fr>
Date: Mon, 17 Oct 2016 09:33:34 +0000
Subject: [PATCH] Created tag release_2_0_3.
---
pom.xml | 4 ++--
src/NexusManager.h | 9 +++++++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5c40f52..f3f7c44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<groupId>fr.soleil.device</groupId>
<artifactId>PulseCounting-${aol}-${mode}</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3</version>
<packaging>nar</packaging>
<name>PulseCounting</name>
@@ -56,7 +56,7 @@
<dependency>
<groupId>fr.soleil.lib</groupId>
<artifactId>NexusCPPV2-${aol}-${library}-${mode}</artifactId>
- <version>2.3.2</version>
+ <version>2.3.3</version>
</dependency>
</dependencies>
<scm>
diff --git a/src/NexusManager.h b/src/NexusManager.h
index 47a903a..654697f 100644
--- a/src/NexusManager.h
+++ b/src/NexusManager.h
@@ -151,6 +151,15 @@ public:
_CPTC("NexusManager::pushNexusData"));
}
+ if (!data)
+ {
+ ERROR_STREAM << "Try to send null data to Nexus!" << std::endl;
+ this->manageNexusAbort();
+ THROW_DEVFAILED(_CPTC("DEVICE_ERROR"),
+ _CPTC("Cannot store data in Nexus file: null data!"),
+ _CPTC("NexusManager::pushNexusData"));
+ }
+
try
{
// check measure dimension
--
GitLab