Resource allocator can report failure of vres cancelation

diff --git a/fres/resalloc/fra.idl b/fres/resalloc/fra.idl
index 73c6edfa8c1a5e871d9a2bc36442c350db049415..d9fc9f5174912403db976349dec197c8dd9fc80e 100644 (file)
--- a/fres/resalloc/fra.idl
+++ b/fres/resalloc/fra.idl
@@ -44,9 +44,11 @@ module fres {
                /** 
                 * Cancel VRESes given by their IDs.
                 * 
-                * @param ids 
+                * @param ids
+                *
+                * @return Zero on success, non-zero error code on error.
                 */
-               void cancel_vreses(in contract::id_seq ids);
+               long cancel_vreses(in contract::id_seq ids);
        };
 };
 

diff --git a/fres/resalloc/fra_generic.c b/fres/resalloc/fra_generic.c
index 6272cf286a4f7ca7ae6bd80b99a4331dc651f7c7..bb1d3cfedde33ac1a431a171a5bc95eb35d366e7 100644 (file)
--- a/fres/resalloc/fra_generic.c
+++ b/fres/resalloc/fra_generic.c
@@ -158,9 +158,9 @@ err:
        return ret;
 }
 
-void cancel_vreses(fres_resource_allocator obj,
-                  const fres_contract_id_seq* ids,
-                  CORBA_Environment *ev)
+CORBA_long cancel_vreses(fres_resource_allocator obj,
+                        const fres_contract_id_seq* ids,
+                        CORBA_Environment *ev)
 {
        int ret, i;
        struct fres_allocator *sch = forb_instance_data(obj);
@@ -178,7 +178,9 @@ void cancel_vreses(fres_resource_allocator obj,
                fres_vreses_delete(vres);
                fres_vres_destroy(vres);
        }
-err:;
+       return 0;
+err:
+       return ret;
 }
 
 static const struct forb_fres_resource_allocator_impl fra_impl = {