[Jcframework-commits] dotnet CPersistenceBroker.vb,1.89.2.4,1.89.2.5

[Richard B. <rb...@us...>]

Update of /cvsroot/jcframework/dotnet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12411

Modified Files:
      Tag: v2_0
	CPersistenceBroker.vb 
Log Message:


Index: CPersistenceBroker.vb
===================================================================
RCS file: /cvsroot/jcframework/dotnet/CPersistenceBroker.vb,v
retrieving revision 1.89.2.4
retrieving revision 1.89.2.5
diff -u -d -r1.89.2.4 -r1.89.2.5
--- CPersistenceBroker.vb	17 Feb 2005 22:00:55 -0000	1.89.2.4
+++ CPersistenceBroker.vb	17 Feb 2005 22:06:58 -0000	1.89.2.5
@@ -3055,7 +3055,7 @@
 						toColl = Nothing
 					End If
 				End If
-				If f.FieldType Is GetType(CPersistentCollection) OrElse f.FieldType.IsSubclassOf(GetType(CPersistentCollection)) Then
+				If Not toColl Is Nothing AndAlso f.FieldType Is GetType(CPersistentCollection) OrElse f.FieldType.IsSubclassOf(GetType(CPersistentCollection)) Then
 					Dim c As CPersistentCollection
 					c = CType(toColl, CPersistentCollection)
 					If Not c.ContainerObject Is Nothing AndAlso c.ContainerObject.Equals(fromObject) Then