From: Zdeněk Salvet Date: Tue, 22 Aug 2006 12:32:24 +0000 (+0000) Subject: - check faults from StartUpload X-Git-Tag: glite-jp-client_R_1_1_2~3 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=84be7e49632f559d74f8482bcb9d304e43dabeb6;p=jra1mw.git - check faults from StartUpload - reset error variable when starting gsiftp upload --- diff --git a/org.glite.jp.client/src/jpimporter.c b/org.glite.jp.client/src/jpimporter.c index 4b0ea4d..98180fe 100644 --- a/org.glite.jp.client/src/jpimporter.c +++ b/org.glite.jp.client/src/jpimporter.c @@ -464,10 +464,13 @@ static int dump_importer(void) dprintf(("[%s] Importing LB dump file '%s'\n", name, tab[_file].val)); if ( !debug ) syslog(LOG_INFO, "Importing LB dump file '%s'\n", msg); ret = soap_call___jpsrv__StartUpload(soap, tab[_jpps].val?:jpps, "", &su_in, &su_out); - ret = check_soap_fault(soap, ret); - /* XXX: grrrrrrr! test it!!!*/ -// if ( (ret = check_soap_fault(soap, ret)) ) break; + if ( (ret = check_soap_fault(soap, ret)) ) break; dprintf(("[%s] Destination: %s\n\tCommit before: %s\n", name, su_out.destination, ctime(&su_out.commitBefore))); + if (su_out.destination == NULL) { + dprintf(("[%s] StartUpload returned NULL destination\n", name)); + if ( !debug ) syslog(LOG_ERR, "StartUpload returned NULL destination"); + break; + } if ( (fhnd = open(tab[_file].val, O_RDONLY)) < 0 ) { dprintf(("[%s] Can't open dump file: %s\n", name, tab[_file].val)); @@ -675,6 +678,7 @@ static int gftp_put_file(const char *url, int fhnd) globus_cond_init(&gCond, GLOBUS_NULL); gDone = GLOBUS_FALSE; + gError = GLOBUS_FALSE; /* do the op */ if ( globus_ftp_client_put(