Fixing some bugs identified by findbugs
git-svn-id: https://svn.apache.org/repos/asf/santuario/xml-security-java/trunk@1770670 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/xml/security/algorithms/implementations/ECDSAUtils.java b/src/main/java/org/apache/xml/security/algorithms/implementations/ECDSAUtils.java
index 1c62650..fab3958 100644
--- a/src/main/java/org/apache/xml/security/algorithms/implementations/ECDSAUtils.java
+++ b/src/main/java/org/apache/xml/security/algorithms/implementations/ECDSAUtils.java
@@ -769,7 +769,6 @@
field = ecFieldFp.getP();
} else {
ECFieldF2m ecFieldF2m = (ECFieldF2m) ecField;
- ecFieldF2m.getReductionPolynomial();
field = ecFieldF2m.getReductionPolynomial();
}
diff --git a/src/main/java/org/apache/xml/security/encryption/XMLCipher.java b/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
index c3a1a24..eafc1ff 100644
--- a/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
+++ b/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
@@ -38,6 +38,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
@@ -3403,9 +3404,9 @@
}
if (!attributeMap.isEmpty()) {
- for (String attribute : attributeMap.keySet()) {
+ for (Entry<String, String> entry : attributeMap.entrySet()) {
result.setAttributeNS(Constants.XML_LANG_SPACE_SpecNS,
- attribute, attributeMap.get(attribute));
+ entry.getKey(), entry.getValue());
}
}
diff --git a/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java b/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java
index 5e2a2dc..9b534b3 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java
@@ -371,7 +371,7 @@
this.encryptEntireRequestPart = encryptEntireRequestPart;
}
- private class Element {
+ private static class Element {
private Element parentElement;
@@ -483,7 +483,7 @@
}
}
- private class NSContext implements NamespaceContext {
+ private static class NSContext implements NamespaceContext {
private NamespaceContext parentNamespaceContext;
private List<String> prefixNsList = Collections.emptyList();
diff --git a/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSecurityInputProcessor.java b/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSecurityInputProcessor.java
index 290a640..c65037f 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSecurityInputProcessor.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSecurityInputProcessor.java
@@ -216,7 +216,7 @@
/**
* Temporary processor to replay the buffered events
*/
- public class InternalReplayProcessor extends AbstractInputProcessor {
+ public static class InternalReplayProcessor extends AbstractInputProcessor {
private final ArrayDeque<XMLSecEvent> xmlSecEventList;
diff --git a/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformIdentity.java b/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformIdentity.java
index 6512427..c30dea4 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformIdentity.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformIdentity.java
@@ -172,7 +172,9 @@
}
}
}
- childOutputMethod.transform(xmlSecEvent);
+ if (childOutputMethod != null) {
+ childOutputMethod.transform(xmlSecEvent);
+ }
}
}
@@ -242,7 +244,9 @@
}
}
}
- childOutputMethod.transform(inputStream);
+ if (childOutputMethod != null) {
+ childOutputMethod.transform(inputStream);
+ }
}
}
diff --git a/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath.java b/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath.java
index 22302e9..d5b87d5 100644
--- a/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath.java
+++ b/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath.java
@@ -93,13 +93,13 @@
throw new TransformationException("xml.WrongContent", exArgs);
}
Node xpathnode = xpathElement.getFirstChild();
- String str = XMLUtils.getStrFromNode(xpathnode);
- input.setNeedsToBeExpanded(needsCircumvent(str));
if (xpathnode == null) {
throw new DOMException(
DOMException.HIERARCHY_REQUEST_ERR, "Text must be in ds:Xpath"
);
}
+ String str = XMLUtils.getStrFromNode(xpathnode);
+ input.setNeedsToBeExpanded(needsCircumvent(str));
XPathFactory xpathFactory = XPathFactory.newInstance();
XPathAPI xpathAPIInstance = xpathFactory.newXPathAPI();
diff --git a/src/main/java/org/apache/xml/security/utils/DOMNamespaceContext.java b/src/main/java/org/apache/xml/security/utils/DOMNamespaceContext.java
index fad7ae2..5e05063 100644
--- a/src/main/java/org/apache/xml/security/utils/DOMNamespaceContext.java
+++ b/src/main/java/org/apache/xml/security/utils/DOMNamespaceContext.java
@@ -21,6 +21,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import java.util.Map.Entry;
import javax.xml.namespace.NamespaceContext;
@@ -44,10 +45,9 @@
}
public String getPrefix(String arg0) {
- for (String key : namespaceMap.keySet()) {
- String value = namespaceMap.get(key);
- if (value.equals(arg0)) {
- return key;
+ for (Entry<String, String> entry : namespaceMap.entrySet()) {
+ if (entry.getValue().equals(arg0)) {
+ return entry.getKey();
}
}
return null;
