nhibernate-commit

[Nhibernate-commit] SF.net SVN: nhibernate:[3664] trunk/nhibernate/src/NHibernate/Impl/ CriteriaImpl.cs

[<fab...@us...>]

Revision: 3664
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3664&view=rev
Author:   fabiomaulo
Date:     2008-07-25 06:37:25 +0000 (Fri, 25 Jul 2008)

Log Message:
-----------
Prevent unmanaged exception.

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Impl/CriteriaImpl.cs

Modified: trunk/nhibernate/src/NHibernate/Impl/CriteriaImpl.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Impl/CriteriaImpl.cs	2008-07-25 06:15:55 UTC (rev 3663)
+++ trunk/nhibernate/src/NHibernate/Impl/CriteriaImpl.cs	2008-07-25 06:37:25 UTC (rev 3664)
@@ -507,8 +507,8 @@
 			// remap the orders
 			foreach (OrderEntry orderEntry in IterateOrderings())
 			{
-				ICriteria currentParent = newParents[orderEntry.Criteria];
-				if (currentParent == null)
+				ICriteria currentParent;
+				if (!newParents.TryGetValue(orderEntry.Criteria, out currentParent))
 				{
 					throw new AssertionFailure(
 						"Could not find parent for order in the previous criteria. If you see this error, it is a bug");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] SF.net SVN: nhibernate:[3756] trunk/nhibernate/src/NHibernate/Impl/ CriteriaImpl.cs

[<aye...@us...>]

Revision: 3756
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3756&view=rev
Author:   ayenderahien
Date:     2008-09-13 06:35:33 +0000 (Sat, 13 Sep 2008)

Log Message:
-----------
Applying patch for NH-1445 - copying persistentClass on Criteria.Clone

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Impl/CriteriaImpl.cs

Modified: trunk/nhibernate/src/NHibernate/Impl/CriteriaImpl.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Impl/CriteriaImpl.cs	2008-09-13 06:26:58 UTC (rev 3755)
+++ trunk/nhibernate/src/NHibernate/Impl/CriteriaImpl.cs	2008-09-13 06:35:33 UTC (rev 3756)
@@ -436,7 +436,15 @@
 
 		public object Clone()
 		{
-			CriteriaImpl clone = new CriteriaImpl(entityOrClassName, Alias, Session);
+			CriteriaImpl clone;
+			if (persistentClass != null)
+			{
+				clone = new CriteriaImpl(persistentClass, Alias, Session);
+			}
+			else
+			{
+				clone = new CriteriaImpl(entityOrClassName, Alias, Session);
+			}
 			CloneSubcriteria(clone);
 			foreach (KeyValuePair<string, FetchMode> de in fetchModes)
 			{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] SF.net SVN: nhibernate:[4461] trunk/nhibernate/src/NHibernate/Impl/ CriteriaImpl.cs

[<te...@us...>]

Revision: 4461
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4461&view=rev
Author:   tehlike
Date:     2009-06-14 10:01:50 +0000 (Sun, 14 Jun 2009)

Log Message:
-----------
Fix NH-1837

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Impl/CriteriaImpl.cs

Modified: trunk/nhibernate/src/NHibernate/Impl/CriteriaImpl.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Impl/CriteriaImpl.cs	2009-06-13 22:06:02 UTC (rev 4460)
+++ trunk/nhibernate/src/NHibernate/Impl/CriteriaImpl.cs	2009-06-14 10:01:50 UTC (rev 4461)
@@ -751,7 +751,7 @@
 				}
 				else
 				{
-					return (T) UniqueResult();
+					return (T) result;
 				}
 			}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Nhibernate-commit] SF.net SVN: nhibernate:[5503] trunk/nhibernate/src/NHibernate/Impl/ CriteriaImpl.cs

[<fab...@us...>]

Revision: 5503
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5503&view=rev
Author:   fabiomaulo
Date:     2011-03-22 18:46:20 +0000 (Tue, 22 Mar 2011)

Log Message:
-----------
Fix NH-2531

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Impl/CriteriaImpl.cs

Modified: trunk/nhibernate/src/NHibernate/Impl/CriteriaImpl.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Impl/CriteriaImpl.cs	2011-03-22 18:28:13 UTC (rev 5502)
+++ trunk/nhibernate/src/NHibernate/Impl/CriteriaImpl.cs	2011-03-22 18:46:20 UTC (rev 5503)
@@ -658,10 +658,7 @@
 				root.subcriteriaList.Add(this);
 
 				root.subcriteriaByPath[path] = this;
-				if (alias != null)
-				{
-					root.subcriteriaByAlias[alias] = this;
-				}
+				SetAlias(alias);
 			}
 
 			internal Subcriteria(CriteriaImpl root, ICriteria parent, string path, string alias, JoinType joinType)
@@ -693,12 +690,7 @@
 			public string Alias
 			{
 				get { return alias; }
-				set
-				{
-					root.subcriteriaByAlias.Remove(alias);
-					alias = value;
-					root.subcriteriaByAlias[alias] = this;
-				}
+				set { SetAlias(value); }
 			}
 
 			public LockMode LockMode
@@ -936,6 +928,19 @@
 				// implemented only for compatibility with CriteriaTransformer
 				return root.Clone();
 			}
+
+			private void SetAlias(string newAlias)
+			{
+				if (alias != null)
+				{
+					root.subcriteriaByAlias.Remove(alias);
+				}
+				if (newAlias != null)
+				{
+					root.subcriteriaByAlias[newAlias] = this;
+				}
+				alias = newAlias;
+			}
 		}
 
 		[Serializable]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.