From f3fb36b8bcaf1c22aa5cb5121c5f2d4f0acf5a55 Mon Sep 17 00:00:00 2001
From: Sonia Minolli <sonia.minolli@synchrotron-soleil.fr>
Date: Thu, 8 Dec 2016 13:00:49 +0000
Subject: [PATCH] Created tag release_2_5_0.
---
pom.xml | 4 ++--
src/NexusManager.h | 9 +++++++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2d389bf..864ed5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<groupId>fr.soleil.device</groupId>
<artifactId>AIControllerV2-${aol}-${mode}</artifactId>
- <version>2.4.4-SNAPSHOT</version>
+ <version>2.5.0</version>
<packaging>nar</packaging>
<name>AIControllerV2</name>
@@ -76,7 +76,7 @@
<dependency>
<groupId>fr.soleil.lib</groupId>
<artifactId>ASL-${aol}-${library}-${mode}</artifactId>
- <version>1.4.7-SNAPSHOT</version>
+ <version>1.5.0</version>
</dependency>
</dependencies>
<developers>
diff --git a/src/NexusManager.h b/src/NexusManager.h
index aed363e..77371e2 100644
--- a/src/NexusManager.h
+++ b/src/NexusManager.h
@@ -146,6 +146,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
{
this->m_pAcqWriter->PushData(item_name, data);
--
GitLab