You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2012/02/15 23:58:43 UTC
svn commit: r1244781 -
/incubator/mesos/trunk/third_party/libprocess/src/process.cpp
Author: benh
Date: Wed Feb 15 22:58:43 2012
New Revision: 1244781
URL: http://svn.apache.org/viewvc?rev=1244781&view=rev
Log:
Removed an incorrectly merged line.
Modified:
incubator/mesos/trunk/third_party/libprocess/src/process.cpp
Modified: incubator/mesos/trunk/third_party/libprocess/src/process.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/third_party/libprocess/src/process.cpp?rev=1244781&r1=1244780&r2=1244781&view=diff
==============================================================================
--- incubator/mesos/trunk/third_party/libprocess/src/process.cpp (original)
+++ incubator/mesos/trunk/third_party/libprocess/src/process.cpp Wed Feb 15 22:58:43 2012
@@ -2687,7 +2687,7 @@ void ProcessBase::visit(const HttpEvent&
dispatch(proxy, &HttpProxy::handle, future, event.request->keepAlive);
// Now call the handler and associate the response with the promise.
- promise->associate(handlers.http[name](*event.request));
+ internal::associate(handlers.http[name](*event.request), promise);
} else if (resources.count(name) > 0) {
HttpOKResponse response;
response.headers["Content-Type"] = resources[name].type;