Author: angela
Date: Thu Oct 15 11:01:01 2015
New Revision: 1708788
URL: http://svn.apache.org/viewvc?rev=1708788&view=rev
Log:
OAK-2674 : Fix FindBug Issues
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java?rev=1708788&r1=1708787&r2=1708788&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java
Thu Oct 15 11:01:01 2015
@@ -545,8 +545,9 @@ class TokenProviderImpl implements Token
return false;
}
- for (String name : mandatoryAttributes.keySet()) {
- String expectedValue = mandatoryAttributes.get(name);
+ for (Map.Entry<String,String> mandatory :
mandatoryAttributes.entrySet()) {
+ String name = mandatory.getKey();
+ String expectedValue = mandatory.getValue();
if
(!expectedValue.equals(tokenCredentials.getAttribute(name))) {
return false;
}
@@ -555,9 +556,10 @@ class TokenProviderImpl implements Token
// update set of informative attributes on the credentials
// based on the properties present on the token node.
Collection<String> attrNames =
Arrays.asList(tokenCredentials.getAttributeNames());
- for (String name : publicAttributes.keySet()) {
+ for (Map.Entry<String,String> attr : publicAttributes.entrySet()) {
+ String name = attr.getKey();
if (!attrNames.contains(name)) {
- tokenCredentials.setAttribute(name,
publicAttributes.get(name).toString());
+ tokenCredentials.setAttribute(name, attr.getValue());
}
}