Fix for FCREPO-1678

fcrepo · Aug 11, 2015 · 2432244 · 2432244
1 parent a9d83ce
commit 2432244
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/ContentExposingResource.java b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/ContentExposingResource.java
@@ -473,8 +473,10 @@ protected static void addCacheControlHeaders(final HttpServletResponse servletRe
             return;
         }
 
-        final EntityTag etag = new EntityTag(resource.getEtagValue());
-        final Date date = resource.getLastModifiedDate();
+        final FedoraResource mutableResource = resource instanceof NonRdfSourceDescription
+                ? ((NonRdfSourceDescription) resource).getDescribedResource() : resource;
+        final EntityTag etag = new EntityTag(mutableResource.getEtagValue());
+        final Date date = mutableResource.getLastModifiedDate();
 
         if (!etag.getValue().isEmpty()) {
             servletResponse.addHeader("ETag", etag.toString());