From fec2079f5c3934e7f09e29c5cb2aaa9805ee4903 Mon Sep 17 00:00:00 2001 From: zhouxin Date: Sun, 1 Aug 2021 21:50:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20DAVFS=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AB=AF=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E6=97=B6=E7=A9=BA?= =?UTF-8?q?=E6=8C=87=E9=92=88=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/net/sf/webdav/methods/DoLock.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/sf/webdav/methods/DoLock.java b/src/main/java/net/sf/webdav/methods/DoLock.java index d5af92f..a57e8d3 100644 --- a/src/main/java/net/sf/webdav/methods/DoLock.java +++ b/src/main/java/net/sf/webdav/methods/DoLock.java @@ -209,6 +209,9 @@ public class DoLock extends AbstractMethod { return; } nullSo = _store.getStoredObject(transaction, _path); + if (nullSo == null) { + nullSo = new StoredObject(); + } // define the newly created resource as null-resource nullSo.setNullResource(true); @@ -416,8 +419,13 @@ public class DoLock extends AbstractMethod { if (currentNode.getNodeType() == Node.ELEMENT_NODE || currentNode.getNodeType() == Node.TEXT_NODE) { - _lockOwner = currentNode.getFirstChild() - .getNodeValue(); + if (currentNode.getFirstChild() != null) { + _lockOwner = currentNode.getFirstChild() + .getNodeValue(); + } else { + _lockOwner = currentNode.toString(); + } + } } }