From aa2e7c321ca330792a6c2a7c41efd923bb1270af Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 04 Jun 2013 14:15:10 +0000
Subject: [PATCH] Initial work for re-opened OPENDJ-866: Local RS is named differently to remote RS under.
---
opends/src/server/org/opends/server/workflowelement/WorkflowElement.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/workflowelement/WorkflowElement.java b/opends/src/server/org/opends/server/workflowelement/WorkflowElement.java
index 4038899..66f53ab 100644
--- a/opends/src/server/org/opends/server/workflowelement/WorkflowElement.java
+++ b/opends/src/server/org/opends/server/workflowelement/WorkflowElement.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions copyright 2013 ForgeRock AS.
*/
package org.opends.server.workflowelement;
@@ -341,9 +342,8 @@
public void finalizeWorkflowElement()
{
// Deregister the monitor provider.
- if (this.statistics != null) {
- DirectoryServer.deregisterMonitorProvider(
- this.statistics.getMonitorInstanceName());
+ if (statistics != null) {
+ DirectoryServer.deregisterMonitorProvider(statistics);
}
}
@@ -461,12 +461,12 @@
* below this object.
* @return boolean
*/
- public boolean hasChildWorkflowElement(WorkflowElement element) {
+ public boolean hasChildWorkflowElement(WorkflowElement<?> element) {
if (this.getChildWorkflowElements().size() == 0) {
return (this.equals(element));
}
- for (WorkflowElement subElement:this.getChildWorkflowElements()) {
+ for (WorkflowElement<?> subElement : this.getChildWorkflowElements()) {
if (subElement.equals(element) ||
subElement.hasChildWorkflowElement(element)) {
return true;
--
Gitblit v1.10.0