Fixed the 'LOCK' method which needed the 'owner' in the lock properti…

…es (which was made optional in the past)
OpenMarshal · Jul 15, 2017 · 21a4a94 · 21a4a94
1 parent 7690933
commit 21a4a94
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/lib/server/commands/Lock.js b/lib/server/commands/Lock.js
@@ -20,7 +20,8 @@ function createResponse(arg, lock) {
     activelock.ele('D:locktoken').ele('D:href', undefined, true).add(lock.uuid);
     activelock.ele('D:lockroot').add(arg.fullUri());
     activelock.ele('D:depth').add('infinity');
-    activelock.ele('D:owner').add(lock.owner);
+    if (lock.owner)
+        activelock.ele('D:owner').add(lock.owner);
     activelock.ele('D:timeout').add('Second-' + lock.lockKind.timeout);
     return prop;
 }

diff --git a/lib/server/v2/commands/Lock.js b/lib/server/v2/commands/Lock.js
@@ -19,7 +19,8 @@ function createResponse(ctx, lock) {
     activelock.ele('D:locktoken').ele('D:href', undefined, true).add(lock.uuid);
     activelock.ele('D:lockroot').ele('D:href', undefined, true).add(encodeURI(ctx.fullUri()));
     activelock.ele('D:depth').add(lock.depth === -1 ? 'infinity' : lock.depth.toString());
-    activelock.ele('D:owner').add(lock.owner);
+    if (lock.owner)
+        activelock.ele('D:owner').add(lock.owner);
     activelock.ele('D:timeout').add('Second-' + lock.lockKind.timeout);
     return prop;
 }

diff --git a/src/server/commands/Lock.ts b/src/server/commands/Lock.ts
@@ -21,7 +21,8 @@ function createResponse(arg : MethodCallArgs, lock : Lock)
     activelock.ele('D:locktoken').ele('D:href', undefined, true).add(lock.uuid);
     activelock.ele('D:lockroot').add(arg.fullUri());
     activelock.ele('D:depth').add('infinity');
-    activelock.ele('D:owner').add(lock.owner);
+    if(lock.owner)
+        activelock.ele('D:owner').add(lock.owner);
     activelock.ele('D:timeout').add('Second-' + lock.lockKind.timeout);
 
     return prop;

diff --git a/src/server/v2/commands/Lock.ts b/src/server/v2/commands/Lock.ts
@@ -23,7 +23,8 @@ function createResponse(ctx : HTTPRequestContext, lock : Lock)
     activelock.ele('D:locktoken').ele('D:href', undefined, true).add(lock.uuid);
     activelock.ele('D:lockroot').ele('D:href', undefined, true).add(encodeURI(ctx.fullUri()));
     activelock.ele('D:depth').add(lock.depth === -1 ? 'infinity' : lock.depth.toString());
-    activelock.ele('D:owner').add(lock.owner);
+    if(lock.owner)
+        activelock.ele('D:owner').add(lock.owner);
     activelock.ele('D:timeout').add('Second-' + lock.lockKind.timeout);
 
     return prop;