You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by gb...@apache.org on 2008/06/05 22:40:05 UTC
svn commit: r663728 - in /ibatis/trunk/cs:
V1/src/IBatisNet.Common/Utilities/TypesResolver/TypeResolver.cs
V1/src/IBatisNet.DataMapper.Test/bin/Debug/IBatisNet.DataMapper.Test.dll.config
V3/src/Apache.Ibatis.Common/Utilities/TypesResolver/TypeResolver.cs
Author: gbayon
Date: Thu Jun 5 13:40:05 2008
New Revision: 663728
URL: http://svn.apache.org/viewvc?rev=663728&view=rev
Log:
fix IBATISNET-270
Modified:
ibatis/trunk/cs/V1/src/IBatisNet.Common/Utilities/TypesResolver/TypeResolver.cs
ibatis/trunk/cs/V1/src/IBatisNet.DataMapper.Test/bin/Debug/IBatisNet.DataMapper.Test.dll.config
ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Utilities/TypesResolver/TypeResolver.cs
Modified: ibatis/trunk/cs/V1/src/IBatisNet.Common/Utilities/TypesResolver/TypeResolver.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V1/src/IBatisNet.Common/Utilities/TypesResolver/TypeResolver.cs?rev=663728&r1=663727&r2=663728&view=diff
==============================================================================
--- ibatis/trunk/cs/V1/src/IBatisNet.Common/Utilities/TypesResolver/TypeResolver.cs (original)
+++ ibatis/trunk/cs/V1/src/IBatisNet.Common/Utilities/TypesResolver/TypeResolver.cs Thu Jun 5 13:40:05 2008
@@ -313,10 +313,10 @@
#region Fields
- private string _unresolvedGenericTypeName = string.Empty;
- private string[] _unresolvedGenericArguments = null;
-
- #endregion
+ private string _unresolvedGenericTypeName = string.Empty;
+ private string[] _unresolvedGenericArguments = null;
+ private readonly static Regex generic = new Regex(@"`\d*\[\[", RegexOptions.Compiled);
+ #endregion
#region Constructor (s) / Destructor
@@ -411,11 +411,8 @@
private void ParseGenericArguments(string originalString)
{
- RegexOptions options = RegexOptions.None;
- Regex regex = new Regex(@".*`\d*\[\[", options);
// Check for match
- bool isMatch = regex.IsMatch(originalString);
-
+ bool isMatch = generic.IsMatch(originalString);
if (!isMatch)
{
_unresolvedGenericTypeName = originalString;
Modified: ibatis/trunk/cs/V1/src/IBatisNet.DataMapper.Test/bin/Debug/IBatisNet.DataMapper.Test.dll.config
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V1/src/IBatisNet.DataMapper.Test/bin/Debug/IBatisNet.DataMapper.Test.dll.config?rev=663728&r1=663727&r2=663728&view=diff
==============================================================================
--- ibatis/trunk/cs/V1/src/IBatisNet.DataMapper.Test/bin/Debug/IBatisNet.DataMapper.Test.dll.config (original)
+++ ibatis/trunk/cs/V1/src/IBatisNet.DataMapper.Test/bin/Debug/IBatisNet.DataMapper.Test.dll.config Thu Jun 5 13:40:05 2008
@@ -31,21 +31,21 @@
<iBATIS>
<logging>
- <logFactoryAdapter type="IBatisNet.Common.Logging.Impl.ConsoleOutLoggerFA, IBatisNet.Common">
+<!-- <logFactoryAdapter type="IBatisNet.Common.Logging.Impl.ConsoleOutLoggerFA, IBatisNet.Common">
<arg key="showLogName" value="true" />
<arg key="showDataTime" value="true" />
<arg key="level" value="ALL" />
<arg key="dateTimeFormat" value="yyyy/MM/dd HH:mm:ss:SSS" />
</logFactoryAdapter>
-
+-->
<!-- <logFactoryAdapter type="IBatisNet.Common.Logging.Impl.Log4NetLoggerFA, IBatisNet.Common.Logging.Log4Net">
<arg key="configType" value="inline" />
</logFactoryAdapter>
-->
-<!--
+
<logFactoryAdapter type="IBatisNet.Common.Logging.Impl.NoOpLoggerFA, IBatisNet.Common" />
--->
+
</logging>
</iBATIS>
Modified: ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Utilities/TypesResolver/TypeResolver.cs
URL: http://svn.apache.org/viewvc/ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Utilities/TypesResolver/TypeResolver.cs?rev=663728&r1=663727&r2=663728&view=diff
==============================================================================
--- ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Utilities/TypesResolver/TypeResolver.cs (original)
+++ ibatis/trunk/cs/V3/src/Apache.Ibatis.Common/Utilities/TypesResolver/TypeResolver.cs Thu Jun 5 13:40:05 2008
@@ -284,10 +284,12 @@
#region Fields
- private string _unresolvedGenericTypeName = string.Empty;
- private string[] _unresolvedGenericArguments = null;
+ private string _unresolvedGenericTypeName = string.Empty;
+ private string[] _unresolvedGenericArguments = null;
- #endregion
+ private readonly static Regex generic = new Regex(@"`\d*\[\[", RegexOptions.Compiled);
+
+ #endregion
#region Constructor (s) / Destructor
@@ -382,10 +384,7 @@
private void ParseGenericArguments(string originalString)
{
- RegexOptions options = RegexOptions.None;
- Regex regex = new Regex(@".*`\d*\[\[", options);
- // Check for match
- bool isMatch = regex.IsMatch(originalString);
+ bool isMatch = generic.IsMatch(originalString);
if (!isMatch)
{