diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcAuthorizationAdvisor.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcAuthorizationAdvisor.java
index 03a7c2d9cf21d5b4ad36a27e646f094c39f3b7dc..c85bd837c7e6fbe2321f77fd277bd77c43ce8502 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcAuthorizationAdvisor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcAuthorizationAdvisor.java
@@ -214,7 +214,10 @@ public class DssServiceRpcAuthorizationAdvisor extends DefaultPointcutAdvisor
             }
             boolean shouldLocksAutomaticallyBeReleased =
                     shouldLocksAutomaticallyBeReleased(methodInvocation.getMethod());
-            manager.lock(dataSetCodes);
+            if (dataSetCodes.isEmpty() == false)
+            {
+                manager.lock(dataSetCodes);
+            }
             try
             {
                 // At least one of the parameters must be annotated
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTaskTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTaskTest.java
index b9a424b781db39b6f047a724f1c77b0f6b66597b..02b97942fcfdbb4f8892dd3b77e667cf395b1533 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTaskTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTaskTest.java
@@ -173,7 +173,7 @@ public class PathInfoDatabaseFeedingTaskTest extends AbstractFileSystemTestCase
                     one(directoryProvider).getDataSetDirectory(dataSet);
                     will(returnValue(new File(workingDirectory, "blabla")));
 
-                    one(shareIdManager).releaseLocks();
+                    exactly(2).of(shareIdManager).releaseLocks();
                 }
             });
         
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java
index c60beb8dfdcbc4c75867a47ce3bac0dfd059ff23..ddc6052ed998086d99be89b89137452c8cb8c59f 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java
@@ -123,6 +123,7 @@ public class DssComponentTest extends AbstractFileSystemTestCase
                 //
                 // AbstractAutoProxyCreator
                 //
+                @SuppressWarnings("rawtypes")
                 @Override
                 protected final Object[] getAdvicesAndAdvisorsForBean(final Class beanClass,
                         final String beanName, final TargetSource customTargetSource)
@@ -454,7 +455,8 @@ public class DssComponentTest extends AbstractFileSystemTestCase
                         {
                             will(throwException(new UserFailureException("Not allowed.")));
                         }
-                        exactly(lockingCount).of(shareIdManager).lock(DUMMY_DATA_SET_CODE);
+                        exactly(lockingCount).of(shareIdManager).lock(
+                                Arrays.asList(DUMMY_DATA_SET_CODE));
                         if (releaseLock)
                         {
                             exactly(lockingCount).of(shareIdManager).releaseLocks();
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java
index 84c2512907bf087007129cc3b8390575deb46837..ca9ddf6fd28d3e03d1b25d05daff8447f0f7d9c4 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java
@@ -725,7 +725,7 @@ public class DssServiceRpcV1Test extends AbstractFileSystemTestCase
                 {
                     for (String dataSetCode : dataSetCodes)
                     {
-                        one(shareIdManager).lock(dataSetCode);
+                        one(shareIdManager).lock(Arrays.asList(dataSetCode));
                     }
                     one(shareIdManager).releaseLocks();
                 }
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGenericTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGenericTest.java
index 7eac079b33d48698948c2a227d6df9c32b71583a..55d1e677ea93838db2210da554c692dac1907878 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGenericTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGenericTest.java
@@ -218,7 +218,7 @@ public class DssServiceRpcGenericTest extends AssertJUnit
         context.checking(new Expectations()
             {
                 {
-                    one(shareIdManager).lock(dataSetCode);
+                    one(shareIdManager).lock(Arrays.asList(dataSetCode));
                     one(shareIdManager).releaseLocks();
                 }
             });