Mercurial > urweb

comparison src/c/request.c @ 1979:81bc76aa4acd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge in upstream changes.
author Patrick Hurst <phurst@mit.edu>
date Sat, 18 Jan 2014 18:26:24 -0500
parents d02c1a0d8082
children c93fbd139732
comparison
equal deleted inserted replaced
1978:c5143edaf3c7 1979:81bc76aa4acd
114 if (r == FATAL || r == BOUNDED_RETRY || r == UNLIMITED_RETRY) 114 if (r == FATAL || r == BOUNDED_RETRY || r == UNLIMITED_RETRY)
115 if (try_rollback(ctx, 0, p->ls->logger_data, p->ls->log_error)) 115 if (try_rollback(ctx, 0, p->ls->logger_data, p->ls->log_error))
116 return NULL; 116 return NULL;
117 } while (r == UNLIMITED_RETRY || (r == BOUNDED_RETRY && retries_left > 0)); 117 } while (r == UNLIMITED_RETRY || (r == BOUNDED_RETRY && retries_left > 0));
118 118
119 if (r != FATAL && r != BOUNDED_RETRY) 119 if (r != FATAL && r != BOUNDED_RETRY) {
120 uw_commit(ctx); 120 if (uw_commit(ctx))
121 r = UNLIMITED_RETRY;
122 }
121 123
122 sleep(p->pdic.period); 124 sleep(p->pdic.period);
123 }; 125 };
124 } 126 }
125 127