diff options
Diffstat (limited to 'resource/transform.go')
| -rw-r--r-- | resource/transform.go | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/resource/transform.go b/resource/transform.go index 005ede767..93ace2ba0 100644 --- a/resource/transform.go +++ b/resource/transform.go @@ -303,12 +303,6 @@ func (r *transformedResource) transform(setContent bool) (err error) { first := chain[0] - contentrc, err := contentReadSeekerCloser(first) - if err != nil { - return err - } - defer contentrc.Close() - // Files with a suffix will be stored in cache (both on disk and in memory) // partitioned by their suffix. There will be other files below /other. // This partition is also how we determine what to delete on server reloads. @@ -347,6 +341,7 @@ func (r *transformedResource) transform(setContent bool) (err error) { r.cache.nlocker.Unlock(key) return } + defer r.cache.nlocker.Unlock(key) defer r.cache.set(key, r) @@ -362,6 +357,13 @@ func (r *transformedResource) transform(setContent bool) (err error) { tctx.InMediaType = first.MediaType() tctx.OutMediaType = first.MediaType() + + contentrc, err := contentReadSeekerCloser(first) + if err != nil { + return err + } + defer contentrc.Close() + tctx.From = contentrc tctx.To = b1 |