From 5816124570dc91b548fb7039f5e07b2561e4cddf Mon Sep 17 00:00:00 2001 From: Chris Hines Date: Wed, 6 Apr 2016 20:38:51 -0400 Subject: [PATCH] Wait to clear db.path until just before db.close returns. The Windows version of funlock needs the db.path to delete the corresponding .lock file. --- db.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/db.go b/db.go index 501d36a..8503665 100644 --- a/db.go +++ b/db.go @@ -94,7 +94,7 @@ type DB struct { path string file *os.File lockfile *os.File // windows only - dataref []byte // mmap'ed readonly, write throws SEGV + dataref []byte // mmap'ed readonly, write throws SEGV data *[maxMapSize]byte datasz int filesz int // current on disk file size @@ -383,11 +383,10 @@ func (db *DB) close() error { if !db.opened { return nil } - + db.opened = false db.freelist = nil - db.path = "" // Clear ops. db.ops.writeAt = nil @@ -414,6 +413,7 @@ func (db *DB) close() error { db.file = nil } + db.path = "" return nil }