Merge branch 'master' of https://github.com/KnowageLabs/Knowage-Server

Author: masseb974

knowage-core/src/main/java/it/eng/spagobi/api/v2/export/ExcelExportJob.java

@@ -137,7 +137,7 @@ protected void export(JobExecutionContext context) throws JobExecutionException
 
 				for (int i = 0; i < resultSetMetaData.getColumnCount(); i++) {
 					String columnName = resultSetMetaData.getColumnName(i + 1);
-					Optional<IFieldMetaData> fieldMetaData = dataSetMetadata.getFieldsMeta().stream().filter(f -> f.getName().equals(columnName)).findFirst();
+					Optional<IFieldMetaData> fieldMetaData = dataSetMetadata.getFieldsMeta().stream().filter(f -> f.getName().equalsIgnoreCase(columnName)).findFirst();
                     fieldMetaData.ifPresent(filteredMetadata::add);
 				}
 

knowagedao/src/main/java/it/eng/spagobi/cache/dao/CacheDAOHibImpl.java

@@ -510,14 +510,6 @@ private void update(SbiCacheItem target, CacheItem source) {
 	private CacheItem toCacheItem(SbiCacheItem hibCacheItem) {
 
 		HashMap<String, Object> properties = null;
-		try {
-			ObjectMapper mapper = new ObjectMapper();
-			TypeReference<HashMap<String, Object>> typeRef = new TypeReference<>() {
-			};
-			properties = mapper.readValue(hibCacheItem.getProperties(), typeRef);
-		} catch (Throwable t) {
-			throw new SpagoBIDAOException("An error occured while creating a CacheItem from SbiCacheItem:", t);
-		}
 
 		CacheItem cacheItem = new CacheItem();
 		cacheItem.setSignature(hibCacheItem.getSignature());
@@ -528,8 +520,17 @@ private CacheItem toCacheItem(SbiCacheItem hibCacheItem) {
 		cacheItem.setLastUsedDate(hibCacheItem.getLastUsedDate());
 		cacheItem.setTenant(hibCacheItem.getCommonInfo().getOrganization());
 
-		if (properties != null) {
-			cacheItem.setProperties(properties);
+		if (hibCacheItem.getProperties() != null) {
+			try {
+				ObjectMapper mapper = new ObjectMapper();
+				TypeReference<HashMap<String, Object>> typeRef = new TypeReference<>() {
+				};
+				properties = mapper.readValue(hibCacheItem.getProperties(), typeRef);
+				cacheItem.setProperties(properties);
+			} catch (Throwable t) {
+				throw new SpagoBIDAOException("An error occured while creating a CacheItem from SbiCacheItem:", t);
+			}
+
 		}
 
 		if (hibCacheItem.getParameters() != null) {