You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by mu...@apache.org on 2007/07/27 15:42:12 UTC
svn commit: r560226 -
/xml/security/trunk/src/org/apache/xml/security/encryption/XMLCipher.java
Author: mullan
Date: Fri Jul 27 06:42:11 2007
New Revision: 560226
URL: http://svn.apache.org/viewvc?view=rev&rev=560226
Log:
Fixed bug 38668: Add XMLCipher.encryptData method that takes serialized data
as parameter (was reopened to fix bug when type parameter is null).
Modified:
xml/security/trunk/src/org/apache/xml/security/encryption/XMLCipher.java
Modified: xml/security/trunk/src/org/apache/xml/security/encryption/XMLCipher.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/encryption/XMLCipher.java?view=diff&rev=560226&r1=560225&r2=560226
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/encryption/XMLCipher.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/encryption/XMLCipher.java Fri Jul 27 06:42:11 2007
@@ -1079,7 +1079,9 @@
// cv.setValue(base64EncodedEncryptedOctets.getBytes());
cv.setValue(base64EncodedEncryptedOctets);
- _ed.setType(new URI(type).toString());
+ if (type != null) {
+ _ed.setType(new URI(type).toString());
+ }
EncryptionMethod method =
_factory.newEncryptionMethod(new URI(_algorithm).toString());
_ed.setEncryptionMethod(method);