FOP-2348:

  - fixing inconsistencies in attribute names when serializing / deserializing extension data, which caused data loss
  - adding testcase to avoid unsignalled regressions


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1659776 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 2 insertions, 2 deletions

diff --git a/src/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachment.java b/src/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachment.java
index f00fc2635..8a6e76ba9 100644
--- a/src/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachment.java
+++ b/src/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachment.java
@@ -40,7 +40,7 @@ public class PDFEmbeddedFileAttachment extends PDFExtensionAttachment {
     private static final String ATT_SRC = "src";
 
     /** a description of the file to be embedded */
-    private static final String ATT_DESC = "desc";
+    private static final String ATT_DESC = "description";
 
     /** filename attribute */
     private String filename;
diff --git a/src/java/org/apache/fop/render/pdf/extensions/PDFExtensionHandler.java b/src/java/org/apache/fop/render/pdf/extensions/PDFExtensionHandler.java
index fb0647fd5..2d53c33bf 100644
--- a/src/java/org/apache/fop/render/pdf/extensions/PDFExtensionHandler.java
+++ b/src/java/org/apache/fop/render/pdf/extensions/PDFExtensionHandler.java
@@ -154,7 +154,7 @@ public class PDFExtensionHandler extends DefaultHandler implements ContentHandle
     public void endElement(String uri, String localName, String qName) throws SAXException {
         if (PDFExtensionAttachment.CATEGORY.equals(uri)) {
             if (PDFEmbeddedFileAttachment.ELEMENT.equals(localName)) {
-                String name = lastAttributes.getValue("name");
+                String name = lastAttributes.getValue("filename");
                 String src = lastAttributes.getValue("src");
                 String desc = lastAttributes.getValue("description");
                 this.lastAttributes = null;