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 2006/06/02 20:39:25 UTC
svn commit: r411232 -
/xml/security/trunk/src/org/apache/xml/security/keys/content/KeyValue.java
Author: mullan
Date: Fri Jun 2 11:39:25 2006
New Revision: 411232
URL: http://svn.apache.org/viewvc?rev=411232&view=rev
Log:
Fix findbugs bug:
Unread field: KeyValue.log
Modified:
xml/security/trunk/src/org/apache/xml/security/keys/content/KeyValue.java
Modified: xml/security/trunk/src/org/apache/xml/security/keys/content/KeyValue.java
URL: http://svn.apache.org/viewvc/xml/security/trunk/src/org/apache/xml/security/keys/content/KeyValue.java?rev=411232&r1=411231&r2=411232&view=diff
==============================================================================
--- xml/security/trunk/src/org/apache/xml/security/keys/content/KeyValue.java (original)
+++ xml/security/trunk/src/org/apache/xml/security/keys/content/KeyValue.java Fri Jun 2 11:39:25 2006
@@ -16,11 +16,8 @@
*/
package org.apache.xml.security.keys.content;
-
-
import java.security.PublicKey;
-
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.keys.content.keyvalues.DSAKeyValue;
import org.apache.xml.security.keys.content.keyvalues.RSAKeyValue;
@@ -42,10 +39,6 @@
*/
public class KeyValue extends SignatureElementProxy implements KeyInfoContent {
- /** {@link org.apache.commons.logging} logging facility */
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(KeyValue.class.getName());
-
/**
* Constructor KeyValue
*
@@ -136,30 +129,23 @@
*/
public PublicKey getPublicKey() throws XMLSecurityException {
-
- Element rsa = XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
+ Element rsa = XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
Constants._TAG_RSAKEYVALUE,0);
- if (rsa != null) {
- RSAKeyValue kv = new RSAKeyValue(rsa,
- this._baseURI);
+ if (rsa != null) {
+ RSAKeyValue kv = new RSAKeyValue(rsa, this._baseURI);
+ return kv.getPublicKey();
+ }
- return kv.getPublicKey();
- }
-
- Element dsa = XMLUtils.selectDsNode(this._constructionElement,
+ Element dsa = XMLUtils.selectDsNode(this._constructionElement,
Constants._TAG_DSAKEYVALUE,0);
-
-
- if (dsa != null) {
- DSAKeyValue kv = new DSAKeyValue(dsa,
- this._baseURI);
+ if (dsa != null) {
+ DSAKeyValue kv = new DSAKeyValue(dsa, this._baseURI);
return kv.getPublicKey();
- }
-
+ }
- return null;
+ return null;
}
/** @inheritDoc */