From f451d2403eb72010875c05eb28ab80d50b71783f Mon Sep 17 00:00:00 2001 From: Jonathan Date: Fri, 19 May 2017 12:56:50 -0600 Subject: [PATCH] 11650 simple fix to avoid extra hits on the db (#11658) (cherry picked from commit 65ce680) --- .../dotcms/util/marshal/CustomDotCmsTypeGsonConfigurator.java | 2 +- .../main/java/com/dotmarketing/business/RoleFactoryImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dotCMS/src/main/java/com/dotcms/util/marshal/CustomDotCmsTypeGsonConfigurator.java b/dotCMS/src/main/java/com/dotcms/util/marshal/CustomDotCmsTypeGsonConfigurator.java index b306d395d472..aec26bc0e281 100644 --- a/dotCMS/src/main/java/com/dotcms/util/marshal/CustomDotCmsTypeGsonConfigurator.java +++ b/dotCMS/src/main/java/com/dotcms/util/marshal/CustomDotCmsTypeGsonConfigurator.java @@ -27,7 +27,7 @@ public void configure(final GsonBuilder gsonBuilder) { gsonBuilder.registerTypeAdapter( Payload.class, new PayloadAdapter() ); gsonBuilder.registerTypeAdapter(ExcludeOwnerVerifierBean.class, new ExcludeOwnerVerifierAdapter()); - gsonBuilder.registerTypeAdapter(Contentlet.class, new ContentletDeserializer() ); + gsonBuilder.registerTypeAdapter(Contentlet.class, new ContentletDeserializer() ); // todo: for 4.2 use just one instance for all of them. gsonBuilder.registerTypeAdapter(HTMLPageAsset.class, new ContentletDeserializer() ); gsonBuilder.registerTypeAdapter(Host.class, new ContentletDeserializer() ); diff --git a/dotCMS/src/main/java/com/dotmarketing/business/RoleFactoryImpl.java b/dotCMS/src/main/java/com/dotmarketing/business/RoleFactoryImpl.java index 7b54a205ccdc..d8c18fc4175a 100644 --- a/dotCMS/src/main/java/com/dotmarketing/business/RoleFactoryImpl.java +++ b/dotCMS/src/main/java/com/dotmarketing/business/RoleFactoryImpl.java @@ -590,7 +590,7 @@ protected boolean doesUserHaveRole(User user, Role role) throws DotDataException @Override protected List loadLayoutIdsForRole(Role role) throws DotDataException { List layouts = rc.getLayoutsForRole(role.getId()); - if(layouts == null || layouts.isEmpty()){ + if(layouts == null){ layouts = new ArrayList(); HibernateUtil hu = new HibernateUtil(Role.class); hu.setQuery("from " + LayoutsRoles.class.getName() + " where role_id = ?");