From b117ed336a8744e6b2b7a8a531743ba58178d8a0 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 27 Nov 2013 10:50:45 +0000
Subject: [PATCH] Factor out duplicate code and fix cut n paste bug in LocalBackendModifyOperation which was preventing sync operations from bypassing backend INTERNAL_ONLY mode.
---
opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java | 44 ++------------------------------------------
1 files changed, 2 insertions(+), 42 deletions(-)
diff --git a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
index cacf2bf..006b9f5 100644
--- a/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
+++ b/opends/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java
@@ -481,48 +481,8 @@
}
}
- // If it is not a private backend, then check to see if the server or
- // backend is operating in read-only mode.
- if (!backend.isPrivateBackend())
- {
- switch (DirectoryServer.getWritabilityMode())
- {
- case DISABLED:
- setResultCodeAndMessageNoInfoDisclosure(entryDN,
- ResultCode.UNWILLING_TO_PERFORM,
- ERR_ADD_SERVER_READONLY.get(String.valueOf(entryDN)));
- return;
-
- case INTERNAL_ONLY:
- if (!(isInternalOperation() || isSynchronizationOperation()))
- {
- setResultCodeAndMessageNoInfoDisclosure(entryDN,
- ResultCode.UNWILLING_TO_PERFORM,
- ERR_ADD_SERVER_READONLY.get(String.valueOf(entryDN)));
- return;
- }
- break;
- }
-
- switch (backend.getWritabilityMode())
- {
- case DISABLED:
- setResultCodeAndMessageNoInfoDisclosure(entryDN,
- ResultCode.UNWILLING_TO_PERFORM,
- ERR_ADD_BACKEND_READONLY.get(String.valueOf(entryDN)));
- return;
-
- case INTERNAL_ONLY:
- if (!(isInternalOperation() || isSynchronizationOperation()))
- {
- setResultCodeAndMessageNoInfoDisclosure(entryDN,
- ResultCode.UNWILLING_TO_PERFORM,
- ERR_ADD_BACKEND_READONLY.get(String.valueOf(entryDN)));
- return;
- }
- break;
- }
- }
+ LocalBackendWorkflowElement.checkIfBackendIsWritable(backend, this,
+ entryDN, ERR_ADD_SERVER_READONLY, ERR_ADD_BACKEND_READONLY);
if (noOp)
{
--
Gitblit v1.10.0