ibatis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gba...@apache.org
Subject svn commit: r707150 - in /ibatis/trunk/cs/V1/src: IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.2005.csproj IBatisNet.DataMapper/Configuration/Cache/FlushInterval.cs IBatisNet.DataMapper/Configuration/Serializers/CacheModelDeSerializer.cs
Date Wed, 22 Oct 2008 17:54:18 GMT
Author: gbayon
Date: Wed Oct 22 10:54:18 2008
New Revision: 707150

URL: http://svn.apache.org/viewvc?rev=707150&view=rev
Log:
Fix IBATISNET-285 + use nunit 4.2.8

Modified:
    ibatis/trunk/cs/V1/src/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.2005.csproj
    ibatis/trunk/cs/V1/src/IBatisNet.DataMapper/Configuration/Cache/FlushInterval.cs
    ibatis/trunk/cs/V1/src/IBatisNet.DataMapper/Configuration/Serializers/CacheModelDeSerializer.cs

Modified: ibatis/trunk/cs/V1/src/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.2005.csproj
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V1/src/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.2005.csproj?rev=707150&r1=707149&r2=707150&view=diff
==============================================================================
--- ibatis/trunk/cs/V1/src/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.2005.csproj
(original)
+++ ibatis/trunk/cs/V1/src/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.2005.csproj
Wed Oct 22 10:54:18 2008
@@ -78,7 +78,7 @@
       <Name>log4net</Name>
       <HintPath>..\External-Bin\Net\1.1\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.4.4.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77,
processorArchitecture=MSIL" />
+    <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77,
processorArchitecture=MSIL" />
     <Reference Include="System">
       <Name>System</Name>
     </Reference>

Modified: ibatis/trunk/cs/V1/src/IBatisNet.DataMapper/Configuration/Cache/FlushInterval.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V1/src/IBatisNet.DataMapper/Configuration/Cache/FlushInterval.cs?rev=707150&r1=707149&r2=707150&view=diff
==============================================================================
--- ibatis/trunk/cs/V1/src/IBatisNet.DataMapper/Configuration/Cache/FlushInterval.cs (original)
+++ ibatis/trunk/cs/V1/src/IBatisNet.DataMapper/Configuration/Cache/FlushInterval.cs Wed Oct
22 10:54:18 2008
@@ -137,27 +137,29 @@
 		/// </summary>
 		public void Initialize()
 		{
+            long interval = 0;
 			if (_milliseconds != 0) 
 			{
-				_interval += (_milliseconds * TimeSpan.TicksPerMillisecond) ;
+                interval += (_milliseconds * TimeSpan.TicksPerMillisecond);
 			}
 			if (_seconds != 0) 
 			{
-				_interval += (_seconds * TimeSpan.TicksPerSecond) ;
+                interval += (_seconds * TimeSpan.TicksPerSecond);
 			}
 			if (_minutes != 0) 
 			{
-				_interval += (_minutes * TimeSpan.TicksPerMinute) ;
+                interval += (_minutes * TimeSpan.TicksPerMinute);
 			}
 			if (_hours != 0) 
 			{
-				_interval += (_hours * TimeSpan.TicksPerHour) ;
+                interval += (_hours * TimeSpan.TicksPerHour);
 			}
 
-			if (_interval == 0)
+            if (interval == 0)
 			{
-				_interval = CacheModel.NO_FLUSH_INTERVAL;
+                interval = CacheModel.NO_FLUSH_INTERVAL;
 			}
+		    _interval = interval;
 		}
 		#endregion
 

Modified: ibatis/trunk/cs/V1/src/IBatisNet.DataMapper/Configuration/Serializers/CacheModelDeSerializer.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V1/src/IBatisNet.DataMapper/Configuration/Serializers/CacheModelDeSerializer.cs?rev=707150&r1=707149&r2=707150&view=diff
==============================================================================
--- ibatis/trunk/cs/V1/src/IBatisNet.DataMapper/Configuration/Serializers/CacheModelDeSerializer.cs
(original)
+++ ibatis/trunk/cs/V1/src/IBatisNet.DataMapper/Configuration/Serializers/CacheModelDeSerializer.cs
Wed Oct 22 10:54:18 2008
@@ -68,8 +68,6 @@
 					flush.Milliseconds = NodeUtils.GetIntAttribute(props, "milliseconds", 0);
 					flush.Minutes = NodeUtils.GetIntAttribute(props, "minutes", 0);
 					flush.Seconds = NodeUtils.GetIntAttribute(props, "seconds", 0);
-
-					flush.Initialize();
 					
 					model.FlushInterval = flush;
 				}



Mime
View raw message