From 9b3fea2181e23181fcea49f3e6c869d98eac8a00 Mon Sep 17 00:00:00 2001
From: mwang <mwang@f6f1c999-d317-4740-80b0-e6d1abc6f99e>
Date: Wed, 21 Mar 2012 09:09:44 +0000
Subject: [PATCH] For Changeset 80195

git-svn-id: http://talendforge.org/svn/tos/branches/branch-5_0@80214 f6f1c999-d317-4740-80b0-e6d1abc6f99e
---
 .../src/main/java/org/talend/repository/ProjectManager.java | 6 ++++++
 .../java/org/talend/repository/model/RepositoryNode.java    | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/org.talend.core.runtime/src/main/java/org/talend/repository/ProjectManager.java b/org.talend.core.runtime/src/main/java/org/talend/repository/ProjectManager.java
index 5c571c3900..a1085adc20 100644
--- a/org.talend.core.runtime/src/main/java/org/talend/repository/ProjectManager.java
+++ b/org.talend.core.runtime/src/main/java/org/talend/repository/ProjectManager.java
@@ -41,6 +41,7 @@ import org.talend.core.ui.IReferencedProjectService;
 import org.talend.repository.model.IProxyRepositoryFactory;
 import org.talend.repository.model.IProxyRepositoryService;
 import org.talend.repository.model.IRepositoryNode;
+import org.talend.repository.model.RepositoryNode;
 import org.talend.repository.model.nodes.IProjectRepositoryNode;
 
 /**
@@ -383,6 +384,11 @@ public final class ProjectManager {
 
                     // FIXME still have many NPE for repository, so comment it
                     // tmpProjectNode.dispose();
+                    if (tmpProjectNode instanceof RepositoryNode) {
+                        ((RepositoryNode) tmpProjectNode).setEnableDisposed(true);
+                    }
+
+                    tmpProjectNode.dispose();
                 }
             }
             viewProjectNodes.add(projectRepNode);
diff --git a/org.talend.core.runtime/src/main/java/org/talend/repository/model/RepositoryNode.java b/org.talend.core.runtime/src/main/java/org/talend/repository/model/RepositoryNode.java
index e26e673fe6..44c9652b2a 100644
--- a/org.talend.core.runtime/src/main/java/org/talend/repository/model/RepositoryNode.java
+++ b/org.talend.core.runtime/src/main/java/org/talend/repository/model/RepositoryNode.java
@@ -453,8 +453,8 @@ public class RepositoryNode implements IRepositoryNode, IActionFilter {
         if (doDispose) {
             this.id = null;
             this.projectTechnicalLabel = null;
-            this.type = null;
-            this.icon = null;
+            // this.type = null;
+            // this.icon = null;
             this.parent = null;
             this.object = null;