Author: manjula Date: Fri May 25 02:45:50 2007 New Revision: 541603 URL: http://svn.apache.org/viewvc?view=rev&rev=541603 Log: Commiting the latest merge.
Modified: webservices/axis2/scratch/c/neethi/rampart/ (props changed) webservices/axis2/scratch/c/neethi/rampart/src/util/rampart_replay_detector.c Propchange: webservices/axis2/scratch/c/neethi/rampart/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Fri May 25 02:45:50 2007 @@ -1 +1 @@ -/webservices/rampart/trunk/c:1-541598 +/webservices/rampart/trunk/c:1-541601 Modified: webservices/axis2/scratch/c/neethi/rampart/src/util/rampart_replay_detector.c URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/rampart/src/util/rampart_replay_detector.c?view=diff&rev=541603&r1=541602&r2=541603 ============================================================================== --- webservices/axis2/scratch/c/neethi/rampart/src/util/rampart_replay_detector.c (original) +++ webservices/axis2/scratch/c/neethi/rampart/src/util/rampart_replay_detector.c Fri May 25 02:45:50 2007 @@ -164,7 +164,15 @@ void *tmp_ts = NULL; /*Temp time stamp (of i'th recored))*/ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[rampart][rrd] Number of records =%d", axutil_hash_count(hash)); - + + /*Get the valid duration for a record*/ + if(rampart_context_get_rd_val(rampart_context, env)){ + valid_duration = axutil_atoi(rampart_context_get_rd_val(rampart_context, env)); + AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[rampart][rrd] Using the specified valid duration %d\n", valid_duration ); + }else{ + AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[rampart][rrd] Using the default valid duration %d\n", valid_duration ); + } + /*If matches ERROR*/ for (hi = axutil_hash_first(hash, env); hi; hi = axutil_hash_next(env, hi)) { axutil_hash_this(hi, (const void**)&id, NULL, &tmp_ts); @@ -177,12 +185,6 @@ } /*Clean up old records*/ - if(rampart_context_get_rd_val(rampart_context, env)){ - valid_duration = axutil_atoi(rampart_context_get_rd_val(rampart_context, env)); - AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[rampart][rrd] Using the specified valid duration %s\n", valid_duration ); - }else{ - AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[rampart][rrd] Using the default valid duration %s\n", valid_duration ); - } if(AXIS2_TRUE == rampart_replay_detector_is_overdue(env , valid_duration, tmp_ts)){ /*Remove the record*/ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[rampart][rrd] removing record (id, tmp_ts) = (%s , %s)\n", (axis2_char_t*)id, (axis2_char_t*)tmp_ts); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]