You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2011/04/29 12:03:53 UTC
svn commit: r1097752 - in /santuario/xml-security-java/trunk/src/main/java:
javax/xml/crypto/dsig/ javax/xml/crypto/dsig/keyinfo/
org/apache/xml/security/utils/ org/apache/xml/security/utils/resolver/
org/jcp/xml/dsig/internal/dom/
Author: coheigea
Date: Fri Apr 29 10:03:53 2011
New Revision: 1097752
URL: http://svn.apache.org/viewvc?rev=1097752&view=rev
Log:
[SANTUARIO-207] - Fixed a few more findbugs warnings.
Modified:
santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/XMLDSigSecurity.java
santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/CachedXPathFuncHereAPI.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java
santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMDigestMethod.java
Modified: santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/XMLDSigSecurity.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/XMLDSigSecurity.java?rev=1097752&r1=1097751&r2=1097752&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/XMLDSigSecurity.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/XMLDSigSecurity.java Fri Apr 29 10:03:53 2011
@@ -154,6 +154,9 @@ final class XMLDSigSecurity {
} else if (type.equals("TransformService")) {
typeClass = javax.xml.crypto.dsig.TransformService.class;
m = false;
+ } else {
+ throw new NoSuchAlgorithmException
+ ("The type " + type + " does not correspond to a known type");
}
String key = type + "." + alg;
if (provider == null) {
Modified: santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory.java?rev=1097752&r1=1097751&r2=1097752&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory.java Fri Apr 29 10:03:53 2011
@@ -112,7 +112,9 @@ public abstract class KeyInfoFactory {
static {
try {
cl = Class.forName("javax.xml.crypto.dsig.XMLDSigSecurity");
- } catch (ClassNotFoundException cnfe) { }
+ } catch (ClassNotFoundException cnfe) {
+ // not possible
+ }
getImplMethod = (Method)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/CachedXPathFuncHereAPI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/CachedXPathFuncHereAPI.java?rev=1097752&r1=1097751&r2=1097752&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/CachedXPathFuncHereAPI.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/CachedXPathFuncHereAPI.java Fri Apr 29 10:03:53 2011
@@ -197,8 +197,7 @@ public class CachedXPathFuncHereAPI {
.getDocumentElement()
: namespaceNode);
- // only check if string points to different object (for performance)
- if (str!=xpathStr) {
+ if (!str.equals(xpathStr)) {
if (str.indexOf("here()")>0) {
context.reset();
dtmManager=context.getDTMManager();
@@ -240,8 +239,7 @@ public class CachedXPathFuncHereAPI {
public XObject eval(
Node contextNode, Node xpathnode, String str, PrefixResolver prefixResolver)
throws TransformerException {
- // only check if string points to different object (for performance)
- if (str!=xpathStr) {
+ if (!str.equals(xpathStr)) {
if (str.indexOf("here()")>0) {
context.reset();
dtmManager=context.getDTMManager();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java?rev=1097752&r1=1097751&r2=1097752&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java Fri Apr 29 10:03:53 2011
@@ -61,7 +61,6 @@ public class ResourceResolver {
* Constructor ResourceResolver
*
* @param className
- * @throws ClassNotFoundException
* @throws IllegalAccessException
* @throws InstantiationException
*/
@@ -174,8 +173,6 @@ public class ResourceResolver {
Class<ResourceResolverSpi> resourceResolverClass =
(Class<ResourceResolverSpi>) Class.forName(className);
register(resourceResolverClass, false);
- } catch (NoClassDefFoundError e) {
- log.warn("Error loading resolver " + className + " disabling it");
} catch (ClassNotFoundException e) {
log.warn("Error loading resolver " + className + " disabling it");
}
@@ -193,8 +190,6 @@ public class ResourceResolver {
Class<ResourceResolverSpi> resourceResolverClass =
(Class<ResourceResolverSpi>) Class.forName(className);
register(resourceResolverClass, true);
- } catch (NoClassDefFoundError e) {
- log.warn("Error loading resolver " + className + " disabling it");
} catch (ClassNotFoundException e) {
log.warn("Error loading resolver " + className + " disabling it");
}
@@ -219,7 +214,9 @@ public class ResourceResolver {
if (log.isDebugEnabled()) {
log.debug("Registered resolver: " + className);
}
- } catch (Exception e) {
+ } catch (IllegalAccessException e) {
+ log.warn("Error loading resolver " + className + " disabling it");
+ } catch (InstantiationException e) {
log.warn("Error loading resolver " + className + " disabling it");
}
}
@@ -232,7 +229,9 @@ public class ResourceResolver {
for (Class<? extends ResourceResolverSpi> defaultResolverClass : defaultResolverList) {
try {
resolverList.add(new ResourceResolver(defaultResolverClass));
- } catch (Exception e) {
+ } catch (IllegalAccessException e) {
+ log.warn("Error loading resolver " + defaultResolverClass + " disabling it");
+ } catch (InstantiationException e) {
log.warn("Error loading resolver " + defaultResolverClass + " disabling it");
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMDigestMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMDigestMethod.java?rev=1097752&r1=1097751&r2=1097752&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMDigestMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/jcp/xml/dsig/internal/dom/DOMDigestMethod.java Fri Apr 29 10:03:53 2011
@@ -177,6 +177,20 @@ public abstract class DOMDigestMethod ex
return (getAlgorithm().equals(odm.getAlgorithm()) && paramsEqual);
}
+
+ @Override
+ public int hashCode() {
+ int result = 17;
+ if (params != null) {
+ result = 31 * result + params.hashCode();
+ }
+ String algorithm = getAlgorithm();
+ if (algorithm != null) {
+ result = 31 * result + algorithm.hashCode();
+ }
+
+ return result;
+ }
/**
* Marshals the algorithm-specific parameters to an Element and