diff options
| author | Peter Baumann <baumann@floridita.rasdaman> | 2009-07-26 21:56:50 +0200 |
|---|---|---|
| committer | Peter Baumann <baumann@rasdaman.org> | 2009-07-26 21:33:33 +0200 |
| commit | 0eaf4e65aa962f165168edf47229c80e50774ae0 (patch) | |
| tree | bf51b89ce7dbaaaead611b341d2b75243da59d30 /rasodmg/database.cc | |
| parent | 50db7bd888de53a53335f62812245c2803bcc96e (diff) | |
| download | rasdaman-upstream-0eaf4e65aa962f165168edf47229c80e50774ae0.tar.gz rasdaman-upstream-0eaf4e65aa962f165168edf47229c80e50774ae0.tar.xz rasdaman-upstream-0eaf4e65aa962f165168edf47229c80e50774ae0.zip | |
PB: fix problem of "db not open" / "ta not open" (proposed by CJ)
Diffstat (limited to 'rasodmg/database.cc')
| -rw-r--r-- | rasodmg/database.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/rasodmg/database.cc b/rasodmg/database.cc index bdf11b0..15bbf57 100644 --- a/rasodmg/database.cc +++ b/rasodmg/database.cc @@ -81,18 +81,18 @@ r_Database::get_type_schema(const char* typeName, type_schema typeType) throw (r { r_Type* retval = 0; - if ((typeName == NULL) || (strlen(typeName) == 0)) - throw r_Error(r_Error::r_Error_NameInvalid); - else if ((typeType != COLLECTION ) && (typeType != MARRAY)) - throw r_Error(r_Error::r_Error_TypeInvalid); - else if (r_Database::actual_database != NULL) - throw r_Error(r_Error::r_Error_DatabaseClosed); - else if (r_Database::actual_database->get_status() != r_Database::not_open) - throw r_Error(r_Error::r_Error_DatabaseClosed); - else if (r_Transaction::actual_transaction != NULL) - throw r_Error(r_Error::r_Error_TransactionNotOpen); - else if (r_Transaction::actual_transaction->get_status() == r_Transaction::active) - throw r_Error(r_Error::r_Error_TransactionNotOpen); + if ((typeName == NULL) || (strlen(typeName) == 0)) + throw r_Error(r_Error::r_Error_NameInvalid); + else if ((typeType != COLLECTION ) && (typeType != MARRAY)) + throw r_Error(r_Error::r_Error_TypeInvalid); + else if (r_Database::actual_database == NULL) + throw r_Error(r_Error::r_Error_DatabaseClosed); + else if (r_Database::actual_database->get_status() == r_Database::not_open) + throw r_Error(r_Error::r_Error_DatabaseClosed); + else if (r_Transaction::actual_transaction == NULL) + throw r_Error(r_Error::r_Error_TransactionNotOpen); + else if (r_Transaction::actual_transaction->get_status() != r_Transaction::active) + throw r_Error(r_Error::r_Error_TransactionNotOpen); else { ClientComm::r_Type_Type type; |