Merge pull request #19415 from briantopping/resources-with-osgi

=htp #19331 Make FileAndResourceDirectives work in OSGi environments
This commit is contained in:
Konrad Malawski 2016-02-08 13:06:18 +01:00
commit 7dd73e42c0

View file

@ -222,7 +222,14 @@ object FileAndResourceDirectives extends FileAndResourceDirectives {
ResourceFile(url, entry.getSize, entry.getTime)
}
} finally jar.close()
case _ None
case _
val conn = url.openConnection()
try {
conn.setUseCaches(false) // otherwise the JDK will keep the connection open when we close!
val len = conn.getContentLength
val lm = conn.getLastModified
Some(ResourceFile(url, len, lm))
} finally conn.getInputStream.close()
}
}
case class ResourceFile(url: URL, length: Long, lastModified: Long)