Projects >> infoglue >>40029a07463ebdf9c471cffa3826d66f69d485c4

Chunk
Conflicting content 
				{
					logger.info("Previous content version for cache cleaning of ContentVersion: " + contentVersionId + ". ContentVersion.id:" + (previousContentVersionVO == null ? "null" : previousContentVersionVO.getContentVersionId()));
				}
<<<<<<< HEAD
				if(previousContentVersionVO != null)
=======
				if (previousContentVersionVO != null)
>>>>>>> 76a5d83428e1d78d1e578858d0b0a9f4d715ec7e
				{
					List previousDigitalAssets = DigitalAssetController.getController().getDigitalAssetVOList(previousContentVersionVO.getContentVersionId(), db);
					for (DigitalAssetVO digitalAssetVO : previousDigitalAssets)
Solution content 
				{
					logger.info("Previous content version for cache cleaning of ContentVersion: " + contentVersionId + ". ContentVersion.id:" + (previousContentVersionVO == null ? "null" : previousContentVersionVO.getContentVersionId()));
				}
				if (previousContentVersionVO != null)
				{
					List previousDigitalAssets = DigitalAssetController.getController().getDigitalAssetVOList(previousContentVersionVO.getContentVersionId(), db);
					for (DigitalAssetVO digitalAssetVO : previousDigitalAssets)
File
AssetUpdatingThread.java
Developer's decision
Version 1
Kind of conflict
If statement