merge in some boost changes

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@511 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
Anthony Minessale
2008-08-18 20:45:05 +00:00
parent 0fd7cd7b7b
commit a0d9ff1e56
4 changed files with 136 additions and 102 deletions

View File

@@ -675,6 +675,12 @@ zap_status_t zap_channel_set_state(zap_channel_t *zchan, zap_channel_state_t sta
return ZAP_FAIL;
}
if (zap_test_flag(zchan->span, ZAP_SPAN_SUSPENDED)) {
if (state != ZAP_CHANNEL_STATE_RESTART && state != ZAP_CHANNEL_STATE_DOWN) {
return ZAP_FAIL;
}
}
if (lock) {
zap_mutex_lock(zchan->mutex);
}