1
=== modified file 'src/server/frontend/protobuf_message_processor.cpp'
2
--- src/server/frontend/protobuf_message_processor.cpp	2017-06-01 13:04:37 +0000
3
+++ src/server/frontend/protobuf_message_processor.cpp	2017-08-07 10:04:17 +0000
4
@@ -76,30 +76,23 @@
5
76
    return request;
76
    return request;
6
77
}
77
}
7
78
78
9
79
class SelfDeletingCallback : public google::protobuf::Closure
79
class CallbackClosure : public google::protobuf::Closure
10
80
{
80
{
11
81
public:
81
public:
13
82
    SelfDeletingCallback(std::function<void()> const& callback)
82
    CallbackClosure(std::function<void()> const& callback)
14
83
    : callback(callback)
83
    : callback(callback)
15
84
    {
84
    {
16
85
    }
85
    }
17
86
86
18
87
    void Run() override
87
    void Run() override
19
88
    {
88
    {
20
89
        struct Deleter
21
90
        {
22
91
          ~Deleter() { delete obj; }
23
92
          SelfDeletingCallback* obj;
24
93
        };
25
94
        Deleter deleter{this};
26
95
        callback();
89
        callback();
27
96
    }
90
    }
28
97
91
29
98
 private:
92
 private:
34
99
  ~SelfDeletingCallback() = default;
93
  CallbackClosure(CallbackClosure&) = delete;
35
100
  SelfDeletingCallback(SelfDeletingCallback&) = delete;
94
  void operator=(const CallbackClosure&) = delete;
36
101
  void operator=(const SelfDeletingCallback&) = delete;
95
  std::function<void()> const callback;
33
102
  std::function<void()> callback;
37
103
};
96
};
38
104
97
39
105
template<typename RequestType, typename ResponseType>
98
template<typename RequestType, typename ResponseType>
40
@@ -125,14 +118,14 @@
41
125
        }
118
        }
42
126
    };
119
    };
43
127
120
45
128
    auto callback = new SelfDeletingCallback{response_callback};
121
    CallbackClosure callback{response_callback};
46
129
122
47
130
    try
123
    try
48
131
    {
124
    {
49
132
        (server->*function)(
125
        (server->*function)(
50
133
            request,
126
            request,
51
134
            result_message.get(),
127
            result_message.get(),
53
135
            callback);
128
            &callback);
54
136
    }
129
    }
55
137
    catch (mir::cookie::SecurityCheckError const& /*err*/)
130
    catch (mir::cookie::SecurityCheckError const& /*err*/)
56
138
    {
131
    {
57
@@ -149,7 +142,7 @@
58
149
        using namespace std::literals;
142
        using namespace std::literals;
59
150
        result_message->set_error("Error processing request: "s +
143
        result_message->set_error("Error processing request: "s +
60
151
            x.what() + "\nInternal error details: " + boost::diagnostic_information(x));
144
            x.what() + "\nInternal error details: " + boost::diagnostic_information(x));
62
152
        callback->Run();
145
        callback.Run();
63
153
    }
146
    }
64
154
}
147
}
65
155
148
Reviewer	Review Type	Date Requested	Status
Brandon Schaefer (community)		2017-08-07	Approve on 2017-08-08
Mir CI Bot	continuous-integration		Approve on 2017-08-07
Review via email: mp+328655@code.launchpad.net