Commit cfb13b30 authored by Andrew Mitchell's avatar Andrew Mitchell
Browse files

Updated factory to use nbc when appropriate

parent cdb16d61

include/kinetic/threadsafe_blocking_kinetic_connection.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ class ThreadsafeBlockingKineticConnection : public BlockingKineticConnection { 
    /// @param[in] network_timeout_seconds  If an operation goes more than network_timeout_seconds

    ///                                     seconds without receiving data the operation will fail

    explicit ThreadsafeBlockingKineticConnection(

        shared_ptr<ThreadsafeNonblockingKineticConnection> nonblocking_connection,

        shared_ptr<NonblockingKineticConnection> nonblocking_connection,

        unsigned int network_timeout_seconds);

    ~ThreadsafeBlockingKineticConnection();

src/main/kinetic_connection_factory.cc

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ Status KineticConnectionFactory::NewThreadsafeBlockingConnection( 
        unsigned int network_timeout_seconds) {

    unique_ptr<NonblockingKineticConnection> nbc(nullptr);

    Status status = doNewConnection(options, nbc, true);

    connection.reset(new BlockingKineticConnection(move(nbc), network_timeout_seconds));

    connection.reset(new ThreadsafeBlockingKineticConnection(move(nbc), network_timeout_seconds));

    return status;

}

src/main/threadsafe_blocking_kinetic_connection.cc

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ using std::make_shared; 
using std::move;



ThreadsafeBlockingKineticConnection::ThreadsafeBlockingKineticConnection(

        shared_ptr<ThreadsafeNonblockingKineticConnection> nonblocking_connection, unsigned int network_timeout_seconds)

        shared_ptr<NonblockingKineticConnection> nonblocking_connection, unsigned int network_timeout_seconds)

    : BlockingKineticConnection(nonblocking_connection, network_timeout_seconds) {}



ThreadsafeBlockingKineticConnection::~ThreadsafeBlockingKineticConnection() {}