From ccaaa5c9f0262165de7953cd4eaa230b46764517 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Tue, 10 Nov 2015 11:24:23 +0000 Subject: [PATCH] optimized code to getSearchItems git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@120255 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../user/workspace/server/GWTWorkspaceServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java index 0bac6b4..df49bc0 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java @@ -1234,8 +1234,14 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT WorkspaceSmartFolder wsSmartFolder = workspace.getSmartFolder(folderId); //get Smart Folder from workspace workspaceLogger.trace("wsFolder " + wsSmartFolder.getName()); GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder(); - workspaceLogger.trace(" children size "+wsSmartFolder.getSearchItems().size()); - return builder.buildGXTListFileGridModelItemForSearch((List) wsSmartFolder.getSearchItems()); + + List searchItems = wsSmartFolder.getSearchItems(); + + if(searchItems!=null){ + workspaceLogger.trace("smart folders size "+searchItems.size()); + return builder.buildGXTListFileGridModelItemForSearch((List) searchItems); + }else + return new ArrayList(); } catch (Exception e) { workspaceLogger.error("Error in get server smart folder by id", e);