summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgregs <greg@10gen.com>2011-10-20 13:44:36 -0400
committerEliot Horowitz <eliot@10gen.com>2011-10-31 21:09:54 -0400
commit3e599665f80b6e40bffa1ff7e293d7f92a8f5149 (patch)
tree7008785866f587c00c5cd3fac02096af2bba41dc
parent65e38831febfbb8b87cd610e05ecc66aa4b1db30 (diff)
downloadmongo-3e599665f80b6e40bffa1ff7e293d7f92a8f5149.tar.gz
spelling
-rw-r--r--client/connpool.cpp12
-rw-r--r--client/connpool.h4
-rw-r--r--s/shard.cpp2
-rw-r--r--s/shard.h2
4 files changed, 10 insertions, 10 deletions
diff --git a/client/connpool.cpp b/client/connpool.cpp
index 2d7c37bfbda..8f40a1d15d8 100644
--- a/client/connpool.cpp
+++ b/client/connpool.cpp
@@ -38,7 +38,7 @@ namespace mongo {
void PoolForHost::done( DBConnectionPool * pool, DBClientBase * c ) {
if ( _pool.size() >= _maxPerHost ) {
- pool->onDestory( c );
+ pool->onDestroy( c );
delete c;
}
else {
@@ -55,7 +55,7 @@ namespace mongo {
_pool.pop();
if ( ! sc.ok( now ) ) {
- pool->onDestory( sc.conn );
+ pool->onDestroy( sc.conn );
delete sc.conn;
continue;
}
@@ -185,7 +185,7 @@ namespace mongo {
void DBConnectionPool::release(const string& host, DBClientBase *c) {
if ( c->isFailed() ) {
- onDestory( c );
+ onDestroy( c );
delete c;
return;
}
@@ -228,12 +228,12 @@ namespace mongo {
}
}
- void DBConnectionPool::onDestory( DBClientBase * conn ) {
+ void DBConnectionPool::onDestroy( DBClientBase * conn ) {
if ( _hooks->size() == 0 )
return;
for ( list<DBConnectionHook*>::iterator i = _hooks->begin(); i != _hooks->end(); i++ ) {
- (*i)->onDestory( conn );
+ (*i)->onDestroy( conn );
}
}
@@ -357,7 +357,7 @@ namespace mongo {
for ( size_t i=0; i<toDelete.size(); i++ ) {
try {
- onDestory( toDelete[i] );
+ onDestroy( toDelete[i] );
delete toDelete[i];
}
catch ( ... ) {
diff --git a/client/connpool.h b/client/connpool.h
index a37dad7ff51..8733abb1f90 100644
--- a/client/connpool.h
+++ b/client/connpool.h
@@ -89,7 +89,7 @@ namespace mongo {
virtual ~DBConnectionHook() {}
virtual void onCreate( DBClientBase * conn ) {}
virtual void onHandedOut( DBClientBase * conn ) {}
- virtual void onDestory( DBClientBase * conn ) {}
+ virtual void onDestroy( DBClientBase * conn ) {}
};
/** Database connection pool.
@@ -119,7 +119,7 @@ namespace mongo {
void onCreate( DBClientBase * conn );
void onHandedOut( DBClientBase * conn );
- void onDestory( DBClientBase * conn );
+ void onDestroy( DBClientBase * conn );
void flush();
diff --git a/s/shard.cpp b/s/shard.cpp
index 75326e047fc..32a1528630a 100644
--- a/s/shard.cpp
+++ b/s/shard.cpp
@@ -370,7 +370,7 @@ namespace mongo {
}
}
- void ShardingConnectionHook::onDestory( DBClientBase * conn ) {
+ void ShardingConnectionHook::onDestroy( DBClientBase * conn ) {
resetShardVersionCB( conn );
}
}
diff --git a/s/shard.h b/s/shard.h
index 1c4dd7589e2..152e7e1e08f 100644
--- a/s/shard.h
+++ b/s/shard.h
@@ -290,7 +290,7 @@ namespace mongo {
virtual void onCreate( DBClientBase * conn );
virtual void onHandedOut( DBClientBase * conn );
- virtual void onDestory( DBClientBase * conn );
+ virtual void onDestroy( DBClientBase * conn );
bool _shardedConnections;
};