From 3efdb92d2a7ade8a3697e6d10f552a3f16e66d2c Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Tue, 21 Feb 2023 11:00:26 +0100
Subject: [PATCH] Performed reload from service

---
 .settings/org.eclipse.wst.common.component    | 30 +++++++++++--------
 .../server/GeoportalDataEntryServiceImpl.java | 12 ++++++--
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 3df7353..38b16fb 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-                                                                                                                                                                                                                                                                                                                                                    	
+                                                                                                                                                                                                                                                                                                                                                        	
+    
     
     
     
@@ -85,7 +86,8 @@
     
     
     <wb-module deploy-name="geoportal-data-entry-app-3.1.0-SNAPSHOT">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                		
+        
         
         
         
@@ -171,7 +173,8 @@
         
         
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                		
+        
         
         
         
@@ -257,7 +260,8 @@
         
         
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                		
+        
         
         
         
@@ -343,7 +347,8 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                        
+        
         
         
         
@@ -381,10 +386,8 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="geoportal-data-common-2.0.3-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/geoportal-data-common/geoportal-data-common">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
+        
         
         
         
@@ -470,7 +473,8 @@
         
         
         <property name="context-root" value="geoportal-data-entry-app"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        		
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                		
+        
         
         
         
@@ -556,7 +560,8 @@
         
         
         <property name="java-output-path" value="/geoportal-data-entry-app/target/geoportal-data-entry-app-2.0.0-SNAPSHOT/WEB-INF/classes"/>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        	
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                	
+    
     
     
     
@@ -642,7 +647,8 @@
     
     
     </wb-module>
-                                                                                                                                                                                                                                                                                                                                                    
+                                                                                                                                                                                                                                                                                                                                                        
+
 
 
 
diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java
index 6816c84..3c44517 100644
--- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java
@@ -561,9 +561,15 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen
 
 			ResultSetPaginatedData searchedData = new ResultSetPaginatedData();
 
-			Integer totalProjectForProfile = SessionUtil.getTotalDocumentForProfileID(getThreadLocalRequest(),
-					theProfileID);
-
+			//If reloadFromService = true, loads the document from the service
+			Integer totalProjectForProfile = null;
+			
+			//Loading total documents from the session
+			if(!reloadFromService) {
+				totalProjectForProfile = SessionUtil.getTotalDocumentForProfileID(getThreadLocalRequest(),
+						theProfileID);
+			}
+	
 			if (totalProjectForProfile == null) {
 				totalProjectForProfile = client.getTotalDocument(theProfileID);
 				SessionUtil.setTotalDocumentForProfileID(getThreadLocalRequest(), theProfileID, totalProjectForProfile);