projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Useless comment
[metaproxy-moved-to-github.git]
/
src
/
filter_frontend_net.cpp
diff --git
a/src/filter_frontend_net.cpp
b/src/filter_frontend_net.cpp
index
f2e0b88
..
f9142e6
100644
(file)
--- a/
src/filter_frontend_net.cpp
+++ b/
src/filter_frontend_net.cpp
@@
-1,5
+1,5
@@
/* This file is part of Metaproxy.
/* This file is part of Metaproxy.
- Copyright (C) 2005-2008 Index Data
+ Copyright (C) 2005-2009 Index Data
Metaproxy is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Metaproxy is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@@
-84,13
+84,13
@@
namespace metaproxy_1 {
class ThreadPoolPackage : public mp::IThreadPoolMsg {
public:
ThreadPoolPackage(mp::Package *package, mp::ZAssocChild *ses) :
class ThreadPoolPackage : public mp::IThreadPoolMsg {
public:
ThreadPoolPackage(mp::Package *package, mp::ZAssocChild *ses) :
- m_session(ses), m_package(package) { };
+ m_assoc_child(ses), m_package(package) { };
~ThreadPoolPackage();
IThreadPoolMsg *handle();
void result();
private:
~ThreadPoolPackage();
IThreadPoolMsg *handle();
void result();
private:
- mp::ZAssocChild *m_session;
+ mp::ZAssocChild *m_assoc_child;
mp::Package *m_package;
};
mp::Package *m_package;
};
@@
-123,14
+123,14
@@
mp::ThreadPoolPackage::~ThreadPoolPackage()
void mp::ThreadPoolPackage::result()
{
void mp::ThreadPoolPackage::result()
{
- m_session->m_no_requests--;
+ m_assoc_child->m_no_requests--;
yazpp_1::GDU *gdu = &m_package->response();
if (gdu->get())
{
int len;
yazpp_1::GDU *gdu = &m_package->response();
if (gdu->get())
{
int len;
- m_session->send_GDU(gdu->get(), &len);
+ m_assoc_child->send_GDU(gdu->get(), &len);
}
else if (!m_package->session().is_closed())
{
}
else if (!m_package->session().is_closed())
{
@@
-147,7
+147,7
@@
void mp::ThreadPoolPackage::result()
z_gdu->u.z3950, Z_Close_systemProblem,
"unhandled Z39.50 request");
z_gdu->u.z3950, Z_Close_systemProblem,
"unhandled Z39.50 request");
- m_session->send_Z_PDU(apdu_response, &len);
+ m_assoc_child->send_Z_PDU(apdu_response, &len);
}
else if (z_gdu && z_gdu->which == Z_GDU_HTTP_Request)
{
}
else if (z_gdu && z_gdu->which == Z_GDU_HTTP_Request)
{
@@
-157,14
+157,14
@@
void mp::ThreadPoolPackage::result()
Z_GDU *zgdu_res
= odr.create_HTTP_Response(m_package->session(),
z_gdu->u.HTTP_Request, 500);
Z_GDU *zgdu_res
= odr.create_HTTP_Response(m_package->session(),
z_gdu->u.HTTP_Request, 500);
- m_session->send_GDU(zgdu_res, &len);
+ m_assoc_child->send_GDU(zgdu_res, &len);
}
m_package->session().close();
}
}
m_package->session().close();
}
- if (m_session->m_no_requests == 0 && m_package->session().is_closed())
+ if (m_assoc_child->m_no_requests == 0 && m_package->session().is_closed())
{
{
- m_session->close();
+ m_assoc_child->close();
}
delete this;
}
}
delete this;
}
@@
-219,7
+219,8
@@
void mp::ZAssocChild::failNotify()
// TODO: send Package to signal "close"
if (m_session.is_closed())
{
// TODO: send Package to signal "close"
if (m_session.is_closed())
{
- delete this;
+ if (m_no_requests == 0)
+ delete this;
return;
}
m_no_requests++;
return;
}
m_no_requests++;
@@
-448,8
+449,9
@@
extern "C" {
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* indent-tabs-mode: nil
- * c-file-style: "stroustrup"
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+