diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2015-02-17 17:25:57 +0000 |
|---|---|---|
| committer | <> | 2015-03-17 16:26:24 +0000 |
| commit | 780b92ada9afcf1d58085a83a0b9e6bc982203d1 (patch) | |
| tree | 598f8b9fa431b228d29897e798de4ac0c1d3d970 /src/xa | |
| parent | 7a2660ba9cc2dc03a69ddfcfd95369395cc87444 (diff) | |
| download | berkeleydb-master.tar.gz | |
Diffstat (limited to 'src/xa')
| -rw-r--r-- | src/xa/xa.c | 12 | ||||
| -rw-r--r-- | src/xa/xa_map.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/xa/xa.c b/src/xa/xa.c index ee75e792..5ce7842f 100644 --- a/src/xa/xa.c +++ b/src/xa/xa.c @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1998, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -233,8 +233,8 @@ __xa_put_txn(env, txnp) SH_TAILQ_REMOVE(&ip->dbth_xatxn, txnp, xa_links, __db_txn); TAILQ_REMOVE(&txnp->mgrp->txn_chain, txnp, links); td = txnp->td; - DB_ASSERT(env, td->xa_ref > 0); - td->xa_ref--; + if (td->xa_ref > 0) + td->xa_ref--; __os_free(env, txnp); ip->dbth_xa_status = TXN_XA_THREAD_UNASSOCIATED; } @@ -852,9 +852,9 @@ __db_xa_commit(xid, rmid, arg_flags) return (ret); /* - * Because this transaction is currently associated, commit will not free - * the transaction structure, which is good, because we need to do that - * in xa_put_txn below. + * Because this transaction is currently associated, commit will + * not free the transaction structure, which is good, because we + * need to do that in xa_put_txn below. */ if ((ret = txnp->commit(txnp, 0)) != 0) { dbenv->err(dbenv, ret, DB_STR("4563", diff --git a/src/xa/xa_map.c b/src/xa/xa_map.c index 4dcf4d75..9fd50185 100644 --- a/src/xa/xa_map.c +++ b/src/xa/xa_map.c @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ |