Merge V3.2 to HEAD

19453: Merged BRANCHES/DEV/BELARUS/V3.2-2010_03_17 to BRANCHES/V3.2: 
      19407: ALF-254: empty files (0 bytes) do not trigger content rules 
         - Some Javadoc cleanup added    
   19601: Follow-up fix for ALF-254: Empty files (0 bytes) do not trigger content rules 
      - CIFS uses 'sys:noContent' instead of 'sys:temporary'; the latter has other behaviour attached



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19639 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/service/cmr/repository/ContentData.java

@@ -153,7 +153,7 @@ public class ContentData implements Serializable
      * Helper method to determine if the data represents any physical content or not.
      * 
      * @param contentData           the content to check (may be <tt>null</tt>)
-     * @return                      <tt>true</tt> if the value is non-null and has a content URL of non-zero length
+     * @return                      <tt>true</tt> if the value is non-null
      */
     public static boolean hasContent(ContentData contentData)
     {
@@ -161,7 +161,7 @@ public class ContentData implements Serializable
         {
             return false;
         }
-        return (contentData.contentUrl != null) && (contentData.size > 0L);
+        return contentData.contentUrl != null;
     }
     
     /**