From d54d6020637fb0151175cd31872ae0f3eab0d46f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Thu, 14 Jul 2022 09:35:42 +0200 Subject: [PATCH] cleanup --- .../src/main/java/eu/etaxonomy/cdm/remote/view/JsonView.java | 2 +- .../main/java/eu/etaxonomy/cdm/servlet/DateHeaderFilter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/JsonView.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/JsonView.java index b6dbe62088..0e47f4e209 100644 --- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/JsonView.java +++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/JsonView.java @@ -149,7 +149,7 @@ public class JsonView extends BaseView implements View { if(type.equals(Type.XML)){ XMLSerializer xmlSerializer = new XMLSerializer(); - if(isCollectionType){ + if(isCollectionType && entity != null){ //can never be null here but there is an IDE warning otherwise xmlSerializer.setArrayName(entity.getClass().getSimpleName()); Class elementType = Object.class; Collection c = (Collection)entity; diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/servlet/DateHeaderFilter.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/servlet/DateHeaderFilter.java index 9c09e16cfb..03520bb798 100644 --- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/servlet/DateHeaderFilter.java +++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/servlet/DateHeaderFilter.java @@ -47,7 +47,7 @@ public class DateHeaderFilter implements Filter { try { OffsetDateTime dateTime = OffsetDateTime.now(); - // from chain.doFilter() NestedServletExceptions with NPEs may bubble up from + // from chain.doFilter() NestedServletExceptions with NPEs may bubble up // from controller methods which miss proper handling of not found entities or the like // (HTTP 404 : uuid not found) // These situations are caught below and logged at info level for debugging purposes -- 2.34.1