- not preventing save when generating a rendition fails.

- only adding a rendition to the forminstancedata's rendition if rendering succeeds.

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

source/java/org/alfresco/web/bean/wcm/AVMEditBean.java

@@ -453,12 +453,12 @@ public class AVMEditBean
                {
                   rendition.regenerate(fid);
                }
-               catch (Throwable t)
+               catch (Exception e)
                {
-                  LOGGER.error("error regenerating " + rendition.getName() + 
-                               ": " + t.getMessage(), t);
                   Utils.addErrorMessage("error regenerating " + rendition.getName() + 
-                                        ": " + t.getMessage(), t);
+                                        " using " + rendition.getRenderingEngineTemplate().getName() + 
+                                        ": " + e.getMessage(),
+                                        e);
                }
             }
             final NodeRef[] uploadedFiles = this.formProcessorSession.getUploadedFiles();