Author: coheigea
Date: Mon Feb 26 11:53:21 2018
New Revision: 1825359
URL: http://svn.apache.org/viewvc?rev=1825359&view=rev
Log:
Fixing a few bugs thrown up by spotbugs
Modified:
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/IssuedToken.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/KerberosSecurity.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/utils/WSSUtils.java
Modified:
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractToken.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractToken.java?rev=1825359&r1=1825358&r2=1825359&view=diff
==============================================================================
---
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractToken.java
(original)
+++
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractToken.java
Mon Feb 26 11:53:21 2018
@@ -100,7 +100,7 @@ public abstract class AbstractToken exte
}
if (issuer == null && that.issuer != null
- || issuer != null && issuer == null) {
+ || issuer != null && that.issuer == null) {
return false;
}
@@ -110,7 +110,7 @@ public abstract class AbstractToken exte
}
if (claims == null && that.claims != null
- || claims != null && claims == null) {
+ || claims != null && that.claims == null) {
return false;
}
Modified:
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/IssuedToken.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/IssuedToken.java?rev=1825359&r1=1825358&r2=1825359&view=diff
==============================================================================
---
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/IssuedToken.java
(original)
+++
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/IssuedToken.java
Mon Feb 26 11:53:21 2018
@@ -67,7 +67,7 @@ public class IssuedToken extends Abstrac
}
if (requestSecurityTokenTemplate == null &&
that.requestSecurityTokenTemplate != null
- || requestSecurityTokenTemplate != null &&
requestSecurityTokenTemplate == null) {
+ || requestSecurityTokenTemplate != null &&
that.requestSecurityTokenTemplate == null) {
return false;
}
Modified:
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java?rev=1825359&r1=1825358&r2=1825359&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
(original)
+++
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
Mon Feb 26 11:53:21 2018
@@ -1013,8 +1013,7 @@ public class SamlAssertionWrapper {
samlVersion = SAMLVersion.VERSION_20;
} else {
LOG.error(
- "SamlAssertionWrapper: found unexpected type "
- + (xmlObject != null ? xmlObject.getClass().getName() :
xmlObject)
+ "SamlAssertionWrapper: found unexpected type " +
xmlObject.getClass().getName()
);
}
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/KerberosSecurity.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/KerberosSecurity.java?rev=1825359&r1=1825358&r2=1825359&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/KerberosSecurity.java
(original)
+++
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/KerberosSecurity.java
Mon Feb 26 11:53:21 2018
@@ -336,6 +336,8 @@ public class KerberosSecurity extends Bi
if (secretKey != null) {
hashCode *= 31 + secretKey.hashCode();
}
- return hashCode *= 31 + super.hashCode();
+ hashCode *= 31 + super.hashCode();
+
+ return hashCode;
}
}
Modified:
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/utils/WSSUtils.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/utils/WSSUtils.java?rev=1825359&r1=1825358&r2=1825359&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/utils/WSSUtils.java
(original)
+++
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/utils/WSSUtils.java
Mon Feb 26 11:53:21 2018
@@ -131,7 +131,7 @@ public class WSSUtils extends XMLSecurit
MessageDigest sha = MessageDigest.getInstance("SHA-1");
sha.reset();
sha.update(b4);
- return new
String(Base64.getMimeEncoder().encodeToString(sha.digest()));
+ return Base64.getMimeEncoder().encodeToString(sha.digest());
} catch (NoSuchAlgorithmException e) {
throw new
WSSecurityException(WSSecurityException.ErrorCode.FAILURE, e,
"decoding.general");
}
