aboutsummaryrefslogtreecommitdiff
path: root/src/zenserver/frontend
diff options
context:
space:
mode:
Diffstat (limited to 'src/zenserver/frontend')
-rw-r--r--src/zenserver/frontend/zipfs.cpp20
-rw-r--r--src/zenserver/frontend/zipfs.h2
2 files changed, 4 insertions, 18 deletions
diff --git a/src/zenserver/frontend/zipfs.cpp b/src/zenserver/frontend/zipfs.cpp
index 42df0520f..f9c2bc8ff 100644
--- a/src/zenserver/frontend/zipfs.cpp
+++ b/src/zenserver/frontend/zipfs.cpp
@@ -149,25 +149,13 @@ ZipFs::ZipFs(IoBuffer&& Buffer)
IoBuffer
ZipFs::GetFile(const std::string_view& FileName) const
{
+ FileMap::iterator Iter = m_Files.find(FileName);
+ if (Iter == m_Files.end())
{
- RwLock::SharedLockScope _(m_FilesLock);
-
- FileMap::const_iterator Iter = m_Files.find(FileName);
- if (Iter == m_Files.end())
- {
- return {};
- }
-
- const FileItem& Item = Iter->second;
- if (Item.GetSize() > 0)
- {
- return IoBuffer(IoBuffer::Wrap, Item.GetData(), Item.GetSize());
- }
+ return {};
}
- RwLock::ExclusiveLockScope _(m_FilesLock);
-
- FileItem& Item = m_Files.find(FileName)->second;
+ FileItem& Item = Iter->second;
if (Item.GetSize() > 0)
{
return IoBuffer(IoBuffer::Wrap, Item.GetData(), Item.GetSize());
diff --git a/src/zenserver/frontend/zipfs.h b/src/zenserver/frontend/zipfs.h
index 19f96567c..1fa7da451 100644
--- a/src/zenserver/frontend/zipfs.h
+++ b/src/zenserver/frontend/zipfs.h
@@ -3,7 +3,6 @@
#pragma once
#include <zencore/iobuffer.h>
-#include <zencore/thread.h>
#include <unordered_map>
@@ -21,7 +20,6 @@ public:
private:
using FileItem = MemoryView;
using FileMap = std::unordered_map<std::string_view, FileItem>;
- mutable RwLock m_FilesLock;
FileMap mutable m_Files;
IoBuffer m_Buffer;
};