diff --git a/Dockerfile b/Dockerfile
index 77c87f9..34a0b65 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,13 +8,12 @@ FROM wearefrank/frank-framework:7.9-20230907.223421
 
 # Compile custom class, this should be changed to a buildstep in the future
 # Add lombok.jar to lib/server to be able to compile custom code with Lombok annotations
-# COPY --chown=tomcat java /tmp/java
-# RUN javac \
-#       /tmp/java/nl/nn/adapterframework/.../File1.java \
-#       /tmp/java/nl/nn/adapterframework/.../File2.java \
-#       -classpath "/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/*:/usr/local/tomcat/lib/*" \
-#       -verbose -d /usr/local/tomcat/webapps/ROOT/WEB-INF/classes
-# RUN rm -rf /tmp/java
+COPY --chown=tomcat java /tmp/java
+RUN javac \
+      /tmp/java/nl/nn/adapterframework/processors/LockerPipeLineProcessor.java \
+      -classpath "/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/*:/usr/local/tomcat/lib/*" \
+      -verbose -d /usr/local/tomcat/webapps/ROOT/WEB-INF/classes
+RUN rm -rf /tmp/java
 
 # Copy database connection settings
 COPY --chown=tomcat context.xml /usr/local/tomcat/conf/Catalina/localhost/ROOT.xml
diff --git a/java/nl/nn/adapterframework/processors/LockerPipeLineProcessor.java b/java/nl/nn/adapterframework/processors/LockerPipeLineProcessor.java
new file mode 100644
index 0000000..057a7e2
--- /dev/null
+++ b/java/nl/nn/adapterframework/processors/LockerPipeLineProcessor.java
@@ -0,0 +1,65 @@
+/*
+   Copyright 2013, 2020 Nationale-Nederlanden, 2021-2023 WeAreFrank!
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+package nl.nn.adapterframework.processors;
+
+import nl.nn.adapterframework.core.PipeLine;
+import nl.nn.adapterframework.core.PipeLine.ExitState;
+import nl.nn.adapterframework.core.PipeLineResult;
+import nl.nn.adapterframework.core.PipeLineSession;
+import nl.nn.adapterframework.core.PipeRunException;
+import nl.nn.adapterframework.stream.Message;
+import nl.nn.adapterframework.util.Locker;
+
+/**
+ * @author Jaco de Groot
+ */
+public class LockerPipeLineProcessor extends PipeLineProcessorBase {
+
+	@Override
+	public PipeLineResult processPipeLine(PipeLine pipeLine, String messageId, Message message, PipeLineSession pipeLineSession, String firstPipe) throws PipeRunException {
+		PipeLineResult pipeLineResult;
+		Locker locker = pipeLine.getLocker();
+		String objectId = null;
+		if (locker != null) {
+			try {
+				objectId = locker.acquire();
+			} catch (Exception e) {
+				throw new PipeRunException(null, "error while setting lock ["+locker+"]", e);
+			}
+			if (objectId == null) {
+				log.info("could not obtain lock ["+locker+"]");
+				pipeLineResult = new PipeLineResult();
+				pipeLineResult.setResult(Message.nullMessage());
+				pipeLineResult.setState(ExitState.SUCCESS);
+			} else {
+				try {
+					pipeLineResult = pipeLineProcessor.processPipeLine(pipeLine, messageId, message, pipeLineSession, firstPipe);
+				} finally {
+					try {
+						locker.release(objectId);
+					} catch (Exception e) {
+						//throw new PipeRunException(null, "error while removing lock", e);
+						String msg = "error while removing lock ["+locker+"]: " + e.getMessage();
+						log.warn(msg);
+					}
+				}
+			}
+		} else {
+			pipeLineResult = pipeLineProcessor.processPipeLine(pipeLine, messageId, message, pipeLineSession, firstPipe);
+		}
+		return pipeLineResult;
+	}
+}
\ No newline at end of file