Author: lbernardo
Date: Fri Jul 18 23:05:19 2014
New Revision: 1611834
URL: http://svn.apache.org/r1611834
Log:
FOP-2395: PDF encryption does not work when PDF version is set in FOP config;
change suggested by Seifeddine Dridi.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/VersionController.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java?rev=1611834&r1=1611833&r2=1611834&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFDocument.java Fri Jul
18 23:05:19 2014
@@ -543,7 +543,9 @@ public class PDFDocument {
PDFObject pdfObject = (PDFObject)this.encryption;
addTrailerObject(pdfObject);
try {
- versionController.setPDFVersion(encryption.getPDFVersion());
+ if
(encryption.getPDFVersion().compareTo(versionController.getPDFVersion()) > 0) {
+
versionController.setPDFVersion(encryption.getPDFVersion());
+ }
} catch (IllegalStateException ise) {
log.warn("Configured encryption requires PDF version " +
encryption.getPDFVersion()
+ " but version has been set to " +
versionController.getPDFVersion() + ".");
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/VersionController.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/VersionController.java?rev=1611834&r1=1611833&r2=1611834&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/VersionController.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/VersionController.java
Fri Jul 18 23:05:19 2014
@@ -69,7 +69,9 @@ public abstract class VersionController
@Override
public void setPDFVersion(Version version) {
- throw new IllegalStateException("Cannot change the version of this
PDF document.");
+ if (super.version.compareTo(version) != 0) {
+ throw new IllegalStateException("Cannot change the version of
this PDF document.");
+ }
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
