Skip to content

Commit 3007d90

Browse files
committed
core: Fix NPE in OperationCLOSE when running maven tests
context.getFs() may be null upon close... Signed-off-by: Christian Kohlschütter <[email protected]>
1 parent b81bcf0 commit 3007d90

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

core/src/main/java/org/dcache/nfs/v4/OperationCLOSE.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.dcache.nfs.v4.xdr.nfs_resop4;
3030
import org.dcache.nfs.v4.xdr.stateid4;
3131
import org.dcache.nfs.vfs.Inode;
32+
import org.dcache.nfs.vfs.VirtualFileSystem;
3233
import org.slf4j.Logger;
3334
import org.slf4j.LoggerFactory;
3435

@@ -59,7 +60,10 @@ public void process(CompoundContext context, nfs_resop4 result)
5960
NFS4State nfsState = client.state(stateid);
6061
Stateids.checkStateId(nfsState.stateid(), stateid);
6162

62-
context.getFs().close(stateid.getOpaque());
63+
VirtualFileSystem fs = context.getFs();
64+
if (fs != null) {
65+
fs.close(stateid.getOpaque());
66+
}
6367

6468
if (context.getMinorversion() == 0) {
6569
nfsState.getStateOwner().acceptAsNextSequence(_args.opclose.seqid);

0 commit comments

Comments
 (0)