Merge branch 'stg-2.409' into stg-2.409-radius

[stg.git] / stglibs / ibpp.lib / transaction.cpp

diff --git a/stglibs/ibpp.lib/transaction.cpp b/stglibs/ibpp.lib/transaction.cpp
index c9a38774a25507de990d2af4f8ebaa73f885b07d..47eb61c7b94ecc5c47af89a2324e2d6e46d7b203 100644 (file)
--- a/stglibs/ibpp.lib/transaction.cpp
+++ b/stglibs/ibpp.lib/transaction.cpp
@@ -103,9 +103,9 @@ void TransactionImpl::AddReservation(IBPP::Database db,
                                        tpb->Insert(table);\r
                                        tpb->Insert(isc_tpb_protected);\r
                                        break;\r
                                        tpb->Insert(table);\r
                                        tpb->Insert(isc_tpb_protected);\r
                                        break;\r

-                       default :\r
+                       /*default :\r

                                        throw LogicExceptionImpl("Transaction::AddReservation",\r
                                        throw LogicExceptionImpl("Transaction::AddReservation",\r

-                                               _("Illegal TTR value detected."));\r
+                                               _("Illegal TTR value detected."));*/\r

                }\r
        }\r
        else throw LogicExceptionImpl("Transaction::AddReservation",\r
                }\r
        }\r
        else throw LogicExceptionImpl("Transaction::AddReservation",\r


@@ -306,7 +306,7 @@ void TransactionImpl::AttachDatabaseImpl(DatabaseImpl* dbi,
                                                                tpb->Insert(isc_tpb_rec_version); break;\r
                case IBPP::ilReadCommitted :    tpb->Insert(isc_tpb_read_committed);\r
                                                                                tpb->Insert(isc_tpb_no_rec_version); break;\r
                                                                tpb->Insert(isc_tpb_rec_version); break;\r
                case IBPP::ilReadCommitted :    tpb->Insert(isc_tpb_read_committed);\r
                                                                                tpb->Insert(isc_tpb_no_rec_version); break;\r

-               default :                                               tpb->Insert(isc_tpb_concurrency); break;\r
+                case IBPP::ilConcurrency :                                             tpb->Insert(isc_tpb_concurrency); break;\r

        }\r
 \r
     if (lr == IBPP::lrNoWait) tpb->Insert(isc_tpb_nowait);\r
        }\r
 \r
     if (lr == IBPP::lrNoWait) tpb->Insert(isc_tpb_nowait);\r