From 18bebb4757da025de7610e8d400a1d1e14a1632e Mon Sep 17 00:00:00 2001
From: wchen <wchen@f6f1c999-d317-4740-80b0-e6d1abc6f99e>
Date: Fri, 14 Mar 2014 07:07:55 +0000
Subject: [PATCH] bug  TUP-1518 :Intermittent NPE when importing  tdm structure

git-svn-id: http://talendforge.org/svn/tos/trunk@115039 f6f1c999-d317-4740-80b0-e6d1abc6f99e
---
 .../repository/model/AbstractEMFRepositoryFactory.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/org.talend.core.repository/src/main/java/org/talend/core/repository/model/AbstractEMFRepositoryFactory.java b/org.talend.core.repository/src/main/java/org/talend/core/repository/model/AbstractEMFRepositoryFactory.java
index 8a7d29005e..eb1f7d4452 100644
--- a/org.talend.core.repository/src/main/java/org/talend/core/repository/model/AbstractEMFRepositoryFactory.java
+++ b/org.talend.core.repository/src/main/java/org/talend/core/repository/model/AbstractEMFRepositoryFactory.java
@@ -937,8 +937,12 @@ public abstract class AbstractEMFRepositoryFactory extends AbstractRepositoryFac
 
     @Override
     public FolderItem getFolderItem(Project project, ERepositoryObjectType itemType, IPath path) {
-        return getFolderHelper(project.getEmfProject()).getFolder(
-                ERepositoryObjectType.getFolderName(itemType) + IPath.SEPARATOR + path);
+        FolderHelper folderHelper = getFolderHelper(project.getEmfProject());
+        FolderItem folderItem = folderHelper.getFolder(ERepositoryObjectType.getFolderName(itemType) + IPath.SEPARATOR + path);
+        if (folderItem == null && itemType != null) {
+            folderItem= folderHelper.createFolder(ERepositoryObjectType.getFolderName(itemType) + IPath.SEPARATOR + path);
+        }
+        return folderItem;
     }
 
     /*