[cdt-patch] Applied: Head & 1.2 branch Fix for PR 45733

["Alain Magloire" <alain@xxxxxxx>]

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/ChangeLog,v
retrieving revision 1.172
diff -u -r1.172 ChangeLog
--- ChangeLog	28 Oct 2003 19:59:34 -0000	1.172
+++ ChangeLog	29 Oct 2003 16:49:21 -0000
@@ -1,3 +1,12 @@
+2003-10-29 Alain Magloire
+
+	Fix for PR 45733
+
+	The BinaryContainer and the ArchiveContainer were not deleted
+	when the CProject was release.
+
+	* model/org/eclipse/cdt/internal/core/model/CModelManager.java
+	* model/org/eclipse/cdt/internal/core/model/CProject.java
 2003-10-27 Alain Magloire
 
 	Fix PR45609:
Index: model/org/eclipse/cdt/internal/core/model/CModelManager.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java,v
retrieving revision 1.34
diff -u -r1.34 CModelManager.java
--- model/org/eclipse/cdt/internal/core/model/CModelManager.java	19 Oct 2003 02:52:31 -0000	1.34
+++ model/org/eclipse/cdt/internal/core/model/CModelManager.java	29 Oct 2003 16:49:21 -0000
@@ -319,6 +319,17 @@
 				for (int i = 0; i < children.length; i++) {
 					releaseCElement(children[i]);
 				}
+				// Make sure we destroy the BinaryContainer and ArchiveContainer
+				// Since they are not part of the children.
+				if (info instanceof CProjectInfo) {
+					CProjectInfo pinfo = (CProjectInfo) info;
+					if (pinfo.vBin != null) {
+						releaseCElement(pinfo.vBin);
+					}
+					if (pinfo.vLib != null) {
+						releaseCElement(pinfo.vLib);
+					}
+				}
 			}
 		}
 
Index: model/org/eclipse/cdt/internal/core/model/CProjectInfo.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CProjectInfo.java,v
retrieving revision 1.2
diff -u -r1.2 CProjectInfo.java
--- model/org/eclipse/cdt/internal/core/model/CProjectInfo.java	27 Mar 2003 16:05:18 -0000	1.2
+++ model/org/eclipse/cdt/internal/core/model/CProjectInfo.java	29 Oct 2003 16:49:21 -0000
@@ -14,8 +14,8 @@
 
 class CProjectInfo extends CContainerInfo {
 
-	private BinaryContainer vBin;
-	private ArchiveContainer vLib;
+	BinaryContainer vBin;
+	ArchiveContainer vLib;
 
 	/**
 	 */