Merge branch 'master' of https://github.com/logicaldoc/community.git

Author: gdesiato

logicaldoc-core/src/main/java/com/logicaldoc/core/lock/LockManager.java

@@ -67,7 +67,7 @@ public List<String> getAllTransactions() {
 	 */
 	public boolean get(String lockName, String transactionId) {
 		GregorianCalendar cal = new GregorianCalendar();
-		cal.add(Calendar.SECOND, config.getInt("lock.wait"));
+		cal.add(Calendar.SECOND, config.getInt("lock.wait", 10));
 		Date ldDate = cal.getTime();
 		while (new Date().before(ldDate)) {
 			try {