reverse the "single pattern" in ccnx wrapper
disable ccn reconnect before the openssl bug get's fixed in ccnx code
it's parc's problem to fix the openssl bug
diff --git a/ccnx/sync-app-socket.cc b/ccnx/sync-app-socket.cc
index 22d51b9..3bc6954 100644
--- a/ccnx/sync-app-socket.cc
+++ b/ccnx/sync-app-socket.cc
@@ -29,7 +29,7 @@
{
SyncAppSocket::SyncAppSocket (const string &syncPrefix, NewDataCallback dataCallback, RemoveCallback rmCallback )
- : m_ccnxHandle (CcnxWrapper::Create ())
+ : m_ccnxHandle (new CcnxWrapper())
, m_newDataCallback(dataCallback)
, m_syncLogic (syncPrefix,
bind(&SyncAppSocket::passCallback, this, _1),
@@ -39,14 +39,13 @@
SyncAppSocket::~SyncAppSocket()
{
- CcnxWrapper::Destroy ();
}
std::string
SyncAppSocket::GetLocalPrefix()
{
// this handle is supposed to be short lived
- CcnxWrapperPtr handle = CcnxWrapper::Create();
+ CcnxWrapperPtr handle( new CcnxWrapper());
return handle->getLocalPrefix();
}
diff --git a/ccnx/sync-ccnx-wrapper.cc b/ccnx/sync-ccnx-wrapper.cc
index df1cbab..b742548 100644
--- a/ccnx/sync-ccnx-wrapper.cc
+++ b/ccnx/sync-ccnx-wrapper.cc
@@ -45,8 +45,6 @@
namespace Sync {
-boost::shared_ptr<CcnxWrapper> CcnxWrapper::s_wrapper;
-
#ifdef _DEBUG_WRAPPER_
CcnxWrapper::CcnxWrapper(char c)
#else
@@ -200,6 +198,9 @@
}
catch (CcnxOperationException &e)
{
+ // do not try reconnect for now
+ throw e;
+ /*
m_connected = false;
// probably ccnd has been stopped
// try reconnect with sleep
@@ -226,6 +227,7 @@
}
}
}
+ */
}
catch (const std::exception &exc)
{