From c131dd7dec4cf92483a4ef37d13f5fa8701af77a Mon Sep 17 00:00:00 2001
From: David Caruana <david.caruana@alfresco.com>
Date: Fri, 27 Jan 2006 16:46:07 +0000
Subject: [PATCH] Fix issue where imported content does not have associated
 binary content stream (i.e. fixes "ContentData does not have a content url"
 error).

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2232 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repo/importer/ImporterComponent.java      | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/source/java/org/alfresco/repo/importer/ImporterComponent.java b/source/java/org/alfresco/repo/importer/ImporterComponent.java
index 4bbd412542..1b619efd6c 100644
--- a/source/java/org/alfresco/repo/importer/ImporterComponent.java
+++ b/source/java/org/alfresco/repo/importer/ImporterComponent.java
@@ -590,18 +590,20 @@ public class ImporterComponent
             // bind import content data description
             DataTypeDefinition dataTypeDef = dictionaryService.getDataType(DataTypeDefinition.CONTENT);
             importContentData = bindPlaceHolder(importContentData, binding);
-            ContentData contentData = (ContentData)DefaultTypeConverter.INSTANCE.convert(dataTypeDef, importContentData);
-            
-            String contentUrl = contentData.getContentUrl();
-            if (contentUrl != null && contentUrl.length() > 0)
+            if (importContentData != null && importContentData.length() > 0)
             {
-                // import the content from the url
-                InputStream contentStream = streamHandler.importStream(contentUrl);
-                ContentWriter writer = contentService.getWriter(nodeRef, propertyName, true);
-                writer.setEncoding(contentData.getEncoding());
-                writer.setMimetype(contentData.getMimetype());
-                writer.putContent(contentStream);
-                reportContentCreated(nodeRef, contentUrl);
+                ContentData contentData = (ContentData)DefaultTypeConverter.INSTANCE.convert(dataTypeDef, importContentData);
+                String contentUrl = contentData.getContentUrl();
+                if (contentUrl != null && contentUrl.length() > 0)
+                {
+                    // import the content from the url
+                    InputStream contentStream = streamHandler.importStream(contentUrl);
+                    ContentWriter writer = contentService.getWriter(nodeRef, propertyName, true);
+                    writer.setEncoding(contentData.getEncoding());
+                    writer.setMimetype(contentData.getMimetype());
+                    writer.putContent(contentStream);
+                    reportContentCreated(nodeRef, contentUrl);
+                }
             }
         }