From 74b5a60082acfb7390d0cf42fb1bfdb7a1bca533 Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Thu, 22 Jan 2015 17:43:23 +0000
Subject: [PATCH] OPENDJ-1743 (CR-5858) Possibly misleading Javadoc on BackendImpl methods
---
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java | 2 +-
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
index 93d7b43..477d891 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
@@ -2489,7 +2489,7 @@
// FIXME -- This will need to be updated appropriately if we decided that
// these plugins should be invoked for synchronization
// operations.
- if (! modifyDNOperation.isSynchronizationOperation())
+ if (modifyDNOperation != null && !modifyDNOperation.isSynchronizationOperation())
{
SubordinateModifyDN pluginResult =
getPluginConfigManager().invokeSubordinateModifyDNPlugins(
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java
index b31e75c..15af457 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java
@@ -2557,7 +2557,7 @@
// FIXME -- This will need to be updated appropriately if we decided that
// these plugins should be invoked for synchronization
// operations.
- if (! modifyDNOperation.isSynchronizationOperation())
+ if (modifyDNOperation != null && !modifyDNOperation.isSynchronizationOperation())
{
SubordinateModifyDN pluginResult =
getPluginConfigManager().invokeSubordinateModifyDNPlugins(
--
Gitblit v1.10.0