Merge pull request #1402 from gritGmbH/enhancement/fix-null-exception…

…-serializer-85 Prevent serialization of exceptions with "null" message
deegree · Nov 23, 2022 · 339856f · 339856f
2 parents 73c1a20 + 603172c
commit 339856f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...ree-services-csw/src/main/java/org/deegree/services/csw/CswExceptionReportSerializer.java b/...ree-services-csw/src/main/java/org/deegree/services/csw/CswExceptionReportSerializer.java
@@ -101,7 +101,7 @@ public void serializeExceptionToXML( XMLStreamWriter writer, OWSException ex )
             writer.writeAttribute( "locator", ex.getLocator() );
         }
         writer.writeStartElement( OWS_NS, "ExceptionText" );
-        writer.writeCharacters( ex.getMessage() );
+        writer.writeCharacters( ex.getMessage() != null ? ex.getMessage() : "not available" );
         writer.writeEndElement();
         writer.writeEndElement(); // Exception
         writer.writeEndElement(); // ExceptionReport

diff --git a/...es-wcs/src/main/java/org/deegree/services/wcs/WCS100ServiceExceptionReportSerializer.java b/...es-wcs/src/main/java/org/deegree/services/wcs/WCS100ServiceExceptionReportSerializer.java
@@ -73,7 +73,7 @@ public void serializeExceptionToXML( XMLStreamWriter writer, OWSException ex )
         if ( ex.getLocator().length() > 0 ) {
             writer.writeAttribute( "locator", ex.getLocator() );
         }
-        writer.writeCharacters( ex.getMessage() );
+        writer.writeCharacters( ex.getMessage() != null ? ex.getMessage() : "not available" );
         writer.writeEndElement(); // ServiceException
         writer.writeEndElement(); // ServiceExceptionReport
     }

diff --git a/...ms/src/main/java/org/deegree/services/wms/controller/WMS111ExceptionReportSerializer.java b/...ms/src/main/java/org/deegree/services/wms/controller/WMS111ExceptionReportSerializer.java
@@ -63,7 +63,7 @@ public void serializeExceptionToXML( XMLStreamWriter writer, OWSException ex )
         if ( ex.getLocator() != null && !"".equals( ex.getLocator().trim() ) ) {
             writer.writeAttribute( "locator", ex.getLocator() );
         }
-        writer.writeCharacters( ex.getMessage() );
+        writer.writeCharacters( ex.getMessage() != null ? ex.getMessage() : "not available" );
         writer.writeEndElement(); // ServiceException
         writer.writeEndElement(); // ServiceExceptionReport
     }