Author: shankar
Date: Tue Dec 21 12:44:56 2010
New Revision: 1051474
URL: http://svn.apache.org/viewvc?rev=1051474&view=rev
Log:
Fixing RAMPART-310
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties?rev=1051474&r1=1051473&r2=1051474&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
Tue Dec 21 12:44:56 2010
@@ -97,4 +97,5 @@ unexprectedSignature = Unexpected signat
invalidTransport = Expected transport is "https" but incoming transport found
: \"{0}\"
requiredElementsMissing = Required Elements not found in the incoming message
: {0}
repeatingNonceValue = Nonce value : {0}, already seen before for user name :
{1}. Possibly this could be a replay attack.
-invalidNonceLifeTime = Invalid value for nonceLifeTime in rampart
configuration file.
\ No newline at end of file
+invalidNonceLifeTime = Invalid value for nonceLifeTime in rampart
configuration file.
+invalidIssuerAddress = Invalid value for Issuer
\ No newline at end of file
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java?rev=1051474&r1=1051473&r2=1051474&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
Tue Dec 21 12:44:56 2010
@@ -438,18 +438,18 @@ public class RampartUtil {
*/
public static String processIssuerAddress(OMElement issuerAddress)
throws RampartException {
- if(issuerAddress != null && issuerAddress.getText() != null &&
- !"".equals(issuerAddress.getText())) {
- return issuerAddress.getText().trim();
- } else {
- if(issuerAddress != null) {
- throw new RampartException("invalidIssuerAddress",
- new String[] { issuerAddress.toString() });
- } else {
- throw new RampartException("invalidIssuerAddress",
- new String[] { "Issuer address null" });
- }
+
+ if(issuerAddress == null){
+ throw new RampartException("invalidIssuerAddress",
+ new String[] { "Issuer address null"
});
+ }
+
+ if(issuerAddress.getText() == null ||
!"".equals(issuerAddress.getText())) {
+ throw new RampartException("invalidIssuerAddress",
+ new String[] {
issuerAddress.toString() });
}
+
+ return issuerAddress.getText().trim();
}
/**
