Merged V3.2 to HEAD

15200: Fixed ETHREEOH-2480: Cannot upload files with .doc extension owing to exception from ContentMetadataExtracter
   15203: ETHREEOH-2246: Rework patch.authorityMigration to be more performant and report progress
   15254: ETHREEOH-2339: Fixed NullPointerException when editing LDAP-synced user who doesn't have an email address
   15267: Applied patch for ETHREEOH-1448: Exception when using the move up/down button when editting a web form
   15270: Mereg (sic) - Record only 15238
   15285: Merged V3.1 to V3.2
      15281: Merged V2.2 to V3.1
         15280: Absorb all metadata exceptions at all levels
      15282: Merged V2.2 to V3.1
         15273: Merged V3.2 to V2.2
            15200: Fixed ETHREEOH-2480: Cannot upload files with .doc extension owing to exception from ContentMetadataExtracter
-------------------------
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/V2.2:r15273,15280
   Merged /alfresco/BRANCHES/V3.1:r15281-15282
   Merged /alfresco/BRANCHES/V3.2:r15200,15203,15254,15267,15270,15285



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

source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java

@@ -645,9 +645,22 @@ abstract public class AbstractMappingMetadataExtracter implements MetadataExtrac
         }
         catch (Throwable e)
         {
-            throw new ContentIOException("Metadata extraction failed: \n" +
-                    "   reader: " + reader,
-                    e);
+            if (logger.isDebugEnabled())
+            {
+                logger.debug(
+                        "Metadata extraction failed: \n" +
+                        "   Extracter: " + this + "\n" +
+                        "   Content:   " + reader,
+                        e);
+            }
+            else
+            {
+                logger.warn(
+                        "Metadata extraction failed (turn on DEBUG for full error): \n" +
+                        "   Extracter: " + this + "\n" +
+                        "   Content:   " + reader + "\n" +
+                        "   Failure:   " + e.getMessage());
+            }
         }
         finally
         {
@@ -658,6 +671,11 @@ abstract public class AbstractMappingMetadataExtracter implements MetadataExtrac
                         "   reader: " + reader + "\n" +
                         "   extracter: " + this);
             }
+            // Make sure that we have something to return
+            if (changedProperties == null)
+            {
+                changedProperties = new HashMap<QName, Serializable>(0);
+            }
         }
         
         // Done