Merge trunk revision 2416:

r2416 | sdake | 2009-09-14 13:27:45 -0700 (Mon, 14 Sep 2009) | 2 lines

Fix error with revision 2415.



git-svn-id: http://svn.fedorahosted.org/svn/corosync/branches/flatiron@2458 fd59a12c-fef9-0310-b244-a6a79926bd2f

lib/cfg.c

@@ -178,16 +178,17 @@ corosync_cfg_dispatch (
 			error = CS_OK;
 			goto error_put;
 		}
-		if (error != CS_OK) {
-			goto error_put;
-		}
 		if (error == CS_ERR_TRY_AGAIN) {
+			error = CS_OK;
 			if (dispatch_flags == CPG_DISPATCH_ALL) {
 				break; /* exit do while cont is 1 loop */
 			} else {
 				continue; /* next poll */
 			}
 		}
+		if (error != CS_OK) {
+			goto error_put;
+		}
 
 		/*
 		 * Make copy of callbacks, message data, unlock instance, and call callback

lib/confdb.c

@@ -313,16 +313,17 @@ cs_error_t confdb_dispatch (
 			error = CS_OK;
 			goto error_put;
 		}
-		if (error != CS_OK) {
-			goto error_put;
-		}
 		if (error == CS_ERR_TRY_AGAIN) {
+			error = CS_OK;
 			if (dispatch_types == CONFDB_DISPATCH_ALL) {
 				break; /* exit do while cont is 1 loop */
 			} else {
 				continue; /* next poll */
 			}
 		}
+		if (error != CS_OK) {
+			goto error_put;
+		}
 
 
 		/*

lib/cpg.c

@@ -247,16 +247,17 @@ cs_error_t cpg_dispatch (
 			error = CS_OK;
 			goto error_put;
 		}
-		if (error != CS_OK) {
-			goto error_put;
-		}
 		if (error == CS_ERR_TRY_AGAIN) {
+			error = CS_OK;
 			if (dispatch_types == CPG_DISPATCH_ALL) {
 				break; /* exit do while cont is 1 loop */
 			} else {
 				continue; /* next poll */
 			}
 		}
+		if (error != CS_OK) {
+			goto error_put;
+		}
 
 		/*
 		 * Make copy of callbacks, message data, unlock instance, and call callback

lib/evs.c

@@ -255,16 +255,17 @@ evs_error_t evs_dispatch (
 			error = CS_OK;
 			goto error_put;
 		}
-		if (error != CS_OK) {
-			goto error_put;
-		}
 		if (error == CS_ERR_TRY_AGAIN) {
+			error = CS_OK;
 			if (dispatch_types == CPG_DISPATCH_ALL) {
 				break; /* exit do while cont is 1 loop */
 			} else {
 				continue; /* next poll */
 			}
 		}
+		if (error != CS_OK) {
+			goto error_put;
+		}
 
 		/*
 		 * Make copy of callbacks, message data, unlock instance, and call callback

lib/quorum.c

@@ -362,16 +362,17 @@ cs_error_t quorum_dispatch (
 			error = CS_OK;
 			goto error_put;
 		}
-		if (error != CS_OK) {
-			goto error_put;
-		}
 		if (error == CS_ERR_TRY_AGAIN) {
+			error = CS_OK;
 			if (dispatch_types == CPG_DISPATCH_ALL) {
 				break; /* exit do while cont is 1 loop */
 			} else {
 				continue; /* next poll */
 			}
 		}
+		if (error != CS_OK) {
+			goto error_put;
+		}
 
 		/*
 		 * Make copy of callbacks, message data, unlock instance, and call callback

lib/votequorum.c

@@ -716,16 +716,17 @@ cs_error_t votequorum_dispatch (
 			error = CS_OK;
 			goto error_put;
 		}
-		if (error != CS_OK) {
-			goto error_put;
-		}
 		if (error == CS_ERR_TRY_AGAIN) {
+			error = CS_OK;
 			if (dispatch_types == CPG_DISPATCH_ALL) {
 				break; /* exit do while cont is 1 loop */
 			} else {
 				continue; /* next poll */
 			}
 		}
+		if (error != CS_OK) {
+			goto error_put;
+		}
 
 		/*
 		 * Make copy of callbacks, message data, unlock instance, and call callback