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 2013/04/23 14:54:48 UTC
svn commit: r1470928 -
/webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/EncryptedDataProcessor.java
Author: coheigea
Date: Tue Apr 23 12:54:47 2013
New Revision: 1470928
URL: http://svn.apache.org/r1470928
Log:
Fixing problem in EncryptedDataProcessor when WSSConfig is null
Modified:
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/EncryptedDataProcessor.java
Modified: webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/EncryptedDataProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/EncryptedDataProcessor.java?rev=1470928&r1=1470927&r2=1470928&view=diff
==============================================================================
--- webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/EncryptedDataProcessor.java (original)
+++ webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/EncryptedDataProcessor.java Tue Apr 23 12:54:47 2013
@@ -181,6 +181,13 @@ public class EncryptedDataProcessor impl
wsDocInfo.addResult(result);
wsDocInfo.addTokenElement(elem);
+ List<WSSecurityEngineResult> completeResults =
+ new ArrayList<WSSecurityEngineResult>();
+ if (encrKeyResults != null) {
+ completeResults.addAll(encrKeyResults);
+ }
+ completeResults.add(result);
+
WSSConfig wssConfig = request.getWssConfig();
if (wssConfig != null) {
// Get hold of the plain text element
@@ -198,18 +205,11 @@ public class EncryptedDataProcessor impl
}
List<WSSecurityEngineResult> results =
proc.handleToken(decryptedElem, request, wsDocInfo);
- List<WSSecurityEngineResult> completeResults =
- new ArrayList<WSSecurityEngineResult>();
- if (encrKeyResults != null) {
- completeResults.addAll(encrKeyResults);
- }
- completeResults.add(result);
completeResults.addAll(0, results);
return completeResults;
}
}
- encrKeyResults.add(result);
- return encrKeyResults;
+ return completeResults;
}
/**