You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2015/03/02 12:40:13 UTC
svn commit: r1663268 - in
/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor:
EncryptedDataProcessor.java SignatureProcessor.java
Author: coheigea
Date: Mon Mar 2 11:40:13 2015
New Revision: 1663268
URL: http://svn.apache.org/r1663268
Log:
Minor changes
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java?rev=1663268&r1=1663267&r2=1663268&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java Mon Mar 2 11:40:13 2015
@@ -23,6 +23,7 @@ import java.security.Principal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -152,7 +153,7 @@ public class EncryptedDataProcessor impl
wsDocInfo.addResult(result);
wsDocInfo.addTokenElement(elem);
- List<WSSecurityEngineResult> completeResults = new ArrayList<>();
+ List<WSSecurityEngineResult> completeResults = new LinkedList<>();
completeResults.addAll(encrKeyResults);
completeResults.add(result);
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java?rev=1663268&r1=1663267&r2=1663268&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java Mon Mar 2 11:40:13 2015
@@ -517,9 +517,8 @@ public class SignatureProcessor implemen
WSDocInfo wsDocInfo
) throws WSSecurityException {
List<WSDataRef> protectedRefs = new ArrayList<>();
- List<?> referencesList = signedInfo.getReferences();
- for (int i = 0; i < referencesList.size(); i++) {
- Reference siRef = (Reference)referencesList.get(i);
+ for (Object reference : signedInfo.getReferences()) {
+ Reference siRef = (Reference)reference;
String uri = siRef.getURI();
if (!"".equals(uri)) {
@@ -582,11 +581,10 @@ public class SignatureProcessor implemen
RequestData requestData,
WSDocInfo wsDocInfo
) throws WSSecurityException {
- List<?> transformsList = siRef.getTransforms();
- for (int j = 0; j < transformsList.size(); j++) {
+ for (Object transformObject : siRef.getTransforms()) {
- Transform transform = (Transform)transformsList.get(j);
+ Transform transform = (Transform)transformObject;
if (STRTransform.TRANSFORM_URI.equals(transform.getAlgorithm())) {
NodeSetData data = (NodeSetData)siRef.getDereferencedData();