Merge branch 'hotfix-2.1.3' into develop

Conflicts:
	src/sender/dataFetchers/getFromFile.py

APIs/dataTransferAPI.py

 # API to communicate with a data transfer unit
 
-__version__ = '2.1.2'
+__version__ = '2.1.3'
 
 import zmq
 import socket

src/sender/dataFetchers/getFromFile.py

@@ -94,13 +94,13 @@ def getMetadata (log, metadata, chunkSize, localTarget = None):
 
 def sendData (log, targets, sourceFile, targetFile, metadata, openConnections, context, prop):
 
-    if not targets:
-        prop["removeFlag"] = False
-        return
+    targets_data     = [i for i in targets if i[2] == "data"]
 
-    chunkSize = metadata[ "chunkSize"   ]
+    if not targets_data:
+        prop["removeFlag"] = True
+        return
 
-    targets_data     = [i for i in targets if i[2] == "data"]
+    chunkSize = metadata[ "chunkSize" ]
 
     chunkNumber = 0
     sendError = False
@@ -134,17 +134,16 @@ def sendData (log, targets, sourceFile, targetFile, metadata, openConnections, c
         except:
             log.error("Unable to pack multipart-message for file " + str(sourceFile), exc_info=True)
 
-        if targets_data:
-            #send message to data targets
-            try:
-                __sendToTargets(log, targets_data, sourceFile, targetFile, openConnections, None, chunkPayload, context)
-                log.debug("Passing multipart-message for file " + str(sourceFile) + " (chunk " + str(chunkNumber) + ")...done.")
+        #send message to data targets
+        try:
+            __sendToTargets(log, targets_data, sourceFile, targetFile, openConnections, None, chunkPayload, context)
+            log.debug("Passing multipart-message for file " + str(sourceFile) + " (chunk " + str(chunkNumber) + ")...done.")
 
-            except DataHandlingError:
-                log.error("Unable to send multipart-message for file " + str(sourceFile) + " (chunk " + str(chunkNumber) + ")", exc_info=True)
-                sendError = True
-            except:
-                log.error("Unable to send multipart-message for file " + str(sourceFile) + " (chunk " + str(chunkNumber) + ")", exc_info=True)
+        except DataHandlingError:
+            log.error("Unable to send multipart-message for file " + str(sourceFile) + " (chunk " + str(chunkNumber) + ")", exc_info=True)
+            sendError = True
+        except:
+            log.error("Unable to send multipart-message for file " + str(sourceFile) + " (chunk " + str(chunkNumber) + ")", exc_info=True)
 
         chunkNumber += 1
 

src/shared/version.py

-__version__ = '2.1.2'
+__version__ = '2.1.3'