You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/01/29 14:21:05 UTC
svn commit: r1780799 -
/axis/axis2/java/rampart/branches/RAMPART-234/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
Author: veithen
Date: Sun Jan 29 14:21:05 2017
New Revision: 1780799
URL: http://svn.apache.org/viewvc?rev=1780799&view=rev
Log:
Avoid unnecessary variable renaming (with respect to trunk).
Modified:
axis/axis2/java/rampart/branches/RAMPART-234/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
Modified: axis/axis2/java/rampart/branches/RAMPART-234/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-234/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java?rev=1780799&r1=1780798&r2=1780799&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-234/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-234/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java Sun Jan 29 14:21:05 2017
@@ -1819,17 +1819,17 @@ public class RampartUtil {
* attribute of the servlet request. No further trust verification is done for the client
* certificate - the transport listener should have already verified this.
*
- * @param messageData
+ * @param rmd
* @throws RampartException
*/
- public static void validateTransport(RampartMessageData messageData) throws RampartException {
+ public static void validateTransport(RampartMessageData rmd) throws RampartException {
- MessageContext msgContext = messageData.getMsgContext();
- RampartPolicyData policyData = messageData.getPolicyData();
+ MessageContext msgContext = rmd.getMsgContext();
+ RampartPolicyData rpd = rmd.getPolicyData();
AxisConfiguration axisConf = msgContext.getConfigurationContext().getAxisConfiguration();
- if(policyData != null && policyData.isTransportBinding() && !messageData.isInitiator()){
- if (policyData.getTransportToken() instanceof HttpsToken) {
+ if(rpd != null && rpd.isTransportBinding() && !rmd.isInitiator()){
+ if (rpd.getTransportToken() instanceof HttpsToken) {
try {
TransportInDescription transportIn = msgContext.getTransportIn();
if (transportIn == null) {
@@ -1868,7 +1868,7 @@ public class RampartUtil {
// verify client certificate used
// try to obtain the client certificate chain directly from the message context
// and then from the servlet request
- HttpsToken token = (HttpsToken)policyData.getTransportToken();
+ HttpsToken token = (HttpsToken)rpd.getTransportToken();
if (token.isRequireClientCertificate()) {
Object certificateChainProperty = msgContext.getProperty(RampartConstants.HTTPS_CLIENT_CERT_KEY);
if (certificateChainProperty instanceof X509Certificate[]) {