no need to check into excluded extensions if included extensions are provided

src/python/dm/common/processing/fileProcessingManager.py

@@ -117,16 +117,15 @@ class FileProcessingManager(threading.Thread,Singleton):
     # Check file extensions for processing
     def checkFileExtensionsForProcessing(self, filePathsDict, uploadInfo):
         includeFileExtensions = uploadInfo.get('includeFileExtensions', [])
+        excludeFileExtensions = uploadInfo.get('excludeFileExtensions', [])
         includeRegex = None
+        excludeRegex = None
         if includeFileExtensions: 
             del uploadInfo['includeFileExtensions']
             self.logger.debug('Will include the following extensions: %s' % (includeFileExtensions))
             includeFileExtensions = includeFileExtensions.split(',')
             includeRegex = RegexUtility.formRegexForListOfFileExtensions(includeFileExtensions)
-        
-        excludeFileExtensions = uploadInfo.get('excludeFileExtensions', [])
-        excludeRegex = None
-        if excludeFileExtensions: 
+        elif excludeFileExtensions: 
             del uploadInfo['excludeFileExtensions']
             self.logger.debug('Will exclude the following extensions: %s' % (excludeFileExtensions))
             excludeFileExtensions = excludeFileExtensions.split(',')

src/python/dm/daq_web_service/service/impl/fileSystemObserver.py

@@ -114,7 +114,7 @@ class FileSystemObserver(threading.Thread,Singleton):
 
         # Check file extension
         includeFileExtensions = daqInfo.get('includeFileExtensions', [])
-        excludeFileExtensions = uploadInfo.get('excludeFileExtensions', [])
+        excludeFileExtensions = daqInfo.get('excludeFileExtensions', [])
         if includeFileExtensions:
             includeFileExtensions = includeFileExtensions.split(',')
             includeRegex = RegexUtility.formRegexForListOfFileExtensions(includeFileExtensions)