=======
				Document doc = pm.getObjectById(Document.class, key);

				// Unlock if lock expired
<<<<<<< HEAD
				if (doc.getLockedBy() != null
						&& doc.getLockedUntil().before(
								new Date(System.currentTimeMillis()))) {
				Date lockedTil = doc.getLockedUntil();

				if (lockedTil != null
						&& lockedTil
								.before(new Date(System.currentTimeMillis()))) {
>>>>>>> df933f371cdb54b35744361a735ae862707d130c
					lockedBy = doc.getLockedBy();
					returning = true;
				}

				Document doc = pm.getObjectById(Document.class, key);

				// Unlock if lock expired
				if (doc.getLockedBy() != null
						&& doc.getLockedUntil().before(
								new Date(System.currentTimeMillis()))) {

					lockedBy = doc.getLockedBy();
					returning = true;
				}