From: Howard Chu <hyc@openldap.org>
Date: Wed, 12 Jan 2011 22:53:43 +0000 (+0000)
Subject: Minor cleanup
X-Git-Tag: MIGRATION_CVS2GIT~207
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b8cf2990073f48393c731544583c510b6d0eb73a;p=openldap

Minor cleanup
---

diff --git a/servers/slapd/back-monitor/search.c b/servers/slapd/back-monitor/search.c
index a7aad3bd10..f567618ed0 100644
--- a/servers/slapd/back-monitor/search.c
+++ b/servers/slapd/back-monitor/search.c
@@ -60,8 +60,7 @@ monitor_send_children(
 		if ( e == NULL ) {
 			return LDAP_SUCCESS;
 		}
-		nonvolatile = 1;
-	
+
 	/* volatile entries */
 	} else {
 		/* if no persistent, return only volatile */
@@ -88,6 +87,9 @@ monitor_send_children(
 	for ( monitor_cache_lock( e ); e != NULL; ) {
 		monitor_entry_update( op, rs, e );
 
+		if ( e == e_nonvolatile )
+			nonvolatile = 1;
+
 		mp = ( monitor_entry_t * )e->e_private;
 		e_tmp = mp->mp_next;
 
@@ -142,9 +144,6 @@ freeout:
 		}
 
 		e = e_tmp;
-		if ( e == e_nonvolatile ) {
-			nonvolatile = 1;
-		}
 	}
 	
 	return LDAP_SUCCESS;