From e3db6d06b95331a3991c54b98c7c5b4a1f417635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Mon, 3 Feb 2014 01:35:47 +0100 Subject: [PATCH] fixed zip file system caching for different file systems from the same archive --- .../java/li/cil/oc/server/fs/ZipFileInputStreamFileSystem.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/li/cil/oc/server/fs/ZipFileInputStreamFileSystem.scala b/src/main/java/li/cil/oc/server/fs/ZipFileInputStreamFileSystem.scala index 7d217bc4b..8dac2949c 100644 --- a/src/main/java/li/cil/oc/server/fs/ZipFileInputStreamFileSystem.scala +++ b/src/main/java/li/cil/oc/server/fs/ZipFileInputStreamFileSystem.scala @@ -66,7 +66,7 @@ object ZipFileInputStreamFileSystem { build[String, ArchiveDirectory]() def fromFile(file: io.File, innerPath: String) = this.synchronized { - Option(cache.get(file.getPath, new Callable[ArchiveDirectory] { + Option(cache.get(file.getPath + ":" + innerPath, new Callable[ArchiveDirectory] { def call = try { val zip = new ZipFile(file.getPath) val cleanedPath = innerPath.stripPrefix("/").stripSuffix("/") + "/"