Merge branch 'hotfix-10.8.14' into stable

pixl8 · Jun 22, 2017 · 7a67da3 · 7a67da3
2 parents 1254a82 + 623b596
commit 7a67da3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/system/services/assetManager/AssetManagerService.cfc b/system/services/assetManager/AssetManagerService.cfc
@@ -1170,7 +1170,7 @@ component displayName="AssetManager Service" {
 
 		if ( arguments.createIfNotExists ) {
 			lock type="exclusive" name=lockName timeout=1 {
-				derivative = derivativeDao.selectData( filter=selectFilter, filterParams=selectFilterParams, selectFields=arguments.selectFields );
+				derivative = derivativeDao.selectData( filter=selectFilter, filterParams=selectFilterParams, selectFields=arguments.selectFields, useCache=false );
 				if ( derivative.recordCount ) {
 					if ( ( derivative.asset_type ?: "" ) == "PENDING"  ) {
 						return QueryNew( '' );
@@ -1184,7 +1184,7 @@ component displayName="AssetManager Service" {
 
 			createAssetDerivative( derivativeId=derivativeId, assetId=arguments.assetId, versionId=arguments.versionId, derivativeName=arguments.derivativeName );
 
-			return derivativeDao.selectData( filter=selectFilter, filterParams=selectFilterParams, selectFields=arguments.selectFields );
+			return derivativeDao.selectData( filter=selectFilter, filterParams=selectFilterParams, selectFields=arguments.selectFields, useCache=false );
 		}
 
 		return QueryNew( '' );