From 3249c377f1204d6710010bf43d5750f58819de90 Mon Sep 17 00:00:00 2001 From: Colin Adams Date: Thu, 8 Aug 2013 07:31:43 +0100 Subject: [PATCH] made deleted into an effective routine --- examples/restbucksCRUD/src/resource/order_handler.e | 8 -------- library/server/wsf/router/wsf_skeleton_handler.e | 7 ++++++- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/examples/restbucksCRUD/src/resource/order_handler.e b/examples/restbucksCRUD/src/resource/order_handler.e index 499e5695..8a24693f 100644 --- a/examples/restbucksCRUD/src/resource/order_handler.e +++ b/examples/restbucksCRUD/src/resource/order_handler.e @@ -297,14 +297,6 @@ feature -- DELETE end end - deleted (req: WSF_REQUEST): BOOLEAN - -- Has resource named by `req' been deleted? - do - if not req.error_handler.has_error then - Result := True - end - end - delete_queued (req: WSF_REQUEST): BOOLEAN -- Has resource named by `req' been queued for deletion? do diff --git a/library/server/wsf/router/wsf_skeleton_handler.e b/library/server/wsf/router/wsf_skeleton_handler.e index cd7bc6d0..b7ad0b39 100644 --- a/library/server/wsf/router/wsf_skeleton_handler.e +++ b/library/server/wsf/router/wsf_skeleton_handler.e @@ -197,7 +197,12 @@ feature -- DELETE -- Has resource named by `req' been deleted? require req_attached: req /= Void - deferred + do + if not req.error_handler.has_error then + Result := True + end + ensure + negative_implication: not Result implies req.error_handler.has_error end delete_queued (req: WSF_REQUEST): BOOLEAN