=htp #19331 Make FileAndResourceDirectives work in OSGi environments

This commit is contained in:
Brian Topping 2016-01-12 08:56:18 -07:00
parent 84fd5a9b2a
commit 2a7e44d32c

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)