From 804789f4c03a95fff726992437b780f58e5ae697 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Wed, 22 Apr 2009 12:06:56 +0000 Subject: [PATCH] elementary fixes of WS NotifNew --- org.glite.lb.server/src/ws_query.c | 3 ++- org.glite.lb.server/src/ws_typeref.c.T | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/org.glite.lb.server/src/ws_query.c b/org.glite.lb.server/src/ws_query.c index 754950e..f0b4ba0 100644 --- a/org.glite.lb.server/src/ws_query.c +++ b/org.glite.lb.server/src/ws_query.c @@ -286,7 +286,8 @@ SOAP_FMAC5 int SOAP_FMAC6 __lb__NotifNew( goto cleanup; } - if (edg_wll_NotifNewServer(ctx,conditions,flags,in->addressOverride,nid,&out->valid)) { + out->valid = in->valid ? *in->valid : 0; + if (edg_wll_NotifNewServer(ctx,conditions,flags,in->destination,nid,&out->valid)) { edg_wll_ErrToFault(ctx, soap); ret = SOAP_FAULT; goto cleanup; diff --git a/org.glite.lb.server/src/ws_typeref.c.T b/org.glite.lb.server/src/ws_typeref.c.T index 7382d96..b07cbb5 100644 --- a/org.glite.lb.server/src/ws_typeref.c.T +++ b/org.glite.lb.server/src/ws_typeref.c.T @@ -664,7 +664,7 @@ int edg_wll_SoapToQueryCondsExt(GLITE_SECURITY_GSOAP_LIST_TYPE(lbt, queryConditi assert(out); if ( !(qr = calloc(__sizecondition + 1, sizeof(*qr))) ) return -1; - for ( i = 0; i < __sizecondition; i++ ) + for ( i = 0; i < __sizecondition && GLITE_SECURITY_GSOAP_LIST_GET(in, i); i++ ) if ( edg_wll_SoapToQueryConds(GLITE_SECURITY_GSOAP_LIST_GET(in, i), qr+i) ) goto err; *out = qr; -- 1.8.2.3