[Springnet-commits] Spring.Net/src/Spring/Spring.Aop/Aspects/Cache CacheParameterAdvice.cs, 1.5, 1.6 CacheResultAdvice.cs, 1.4, 1.5

[Erich E. <oak...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Aop/Aspects/Cache
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv4793

Modified Files:
	CacheParameterAdvice.cs CacheResultAdvice.cs 
Log Message:
SPRNET-683, SPRNET-712

Index: CacheParameterAdvice.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Aop/Aspects/Cache/CacheParameterAdvice.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CacheParameterAdvice.cs	1 Apr 2007 15:04:04 -0000	1.5
--- CacheParameterAdvice.cs	24 Aug 2007 22:43:46 -0000	1.6
***************
*** 96,101 ****
                          object key = paramInfo.KeyExpression.GetValue(arguments[i]);
  
!                         cache.Insert(key, arguments[i], paramInfo.TimeToLive,
!                                      paramInfo.SlidingExpiration, paramInfo.Priority);
                      }
                  }
--- 96,100 ----
                          object key = paramInfo.KeyExpression.GetValue(arguments[i]);
  
!                         cache.Insert(key, arguments[i], paramInfo.TimeToLiveTimeSpan);
                      }
                  }

Index: CacheResultAdvice.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Aop/Aspects/Cache/CacheResultAdvice.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CacheResultAdvice.cs	22 Aug 2007 20:15:58 -0000	1.4
--- CacheResultAdvice.cs	24 Aug 2007 22:43:46 -0000	1.5
***************
*** 152,157 ****
                      if (EvalCondition(resultInfo.Condition, resultInfo.ConditionExpression, returnValue, vars))
                      {
!                         cache.Insert(resultKey, (returnValue==null)?NullValue:returnValue, resultInfo.TimeToLive,
!                                         resultInfo.SlidingExpiration, resultInfo.Priority);
                      }
                  }
--- 152,156 ----
                      if (EvalCondition(resultInfo.Condition, resultInfo.ConditionExpression, returnValue, vars))
                      {
!                         cache.Insert(resultKey, (returnValue==null)?NullValue:returnValue, resultInfo.TimeToLiveTimeSpan);
                      }
                  }
***************
*** 198,203 ****
                      {
                          object itemKey = itemInfo.KeyExpression.GetValue(item);
!                         cache.Insert(itemKey, (item==null?NullValue:item), itemInfo.TimeToLive,
!                                      itemInfo.SlidingExpiration, itemInfo.Priority);
                      }
                  }
--- 197,201 ----
                      {
                          object itemKey = itemInfo.KeyExpression.GetValue(item);
!                         cache.Insert(itemKey, (item==null?NullValue:item), itemInfo.TimeToLiveTimeSpan);
                      }
                  }