diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java b/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java index 18a50fc0f..4b0c7a0f3 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/DefaultHttpHeaders.java @@ -96,7 +96,7 @@ public class DefaultHttpHeaders implements HttpHeaders { if (lastModified != null) { response.setDateHeader("Last-Modified", lastModified.getTime()); } - if (etag == null && !noETag) { + if (etag == null && !noETag && target != null) { etag = String.valueOf(target.hashCode()); } if (etag != null) {