You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jg...@apache.org on 2012/10/10 14:53:54 UTC
svn commit: r1396578 - in
/karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules:
properties/PropertiesBackingEngine.java
properties/PropertiesLoginModule.java publickey/PublickeyLoginModule.java
Author: jgoodyear
Date: Wed Oct 10 12:53:54 2012
New Revision: 1396578
URL: http://svn.apache.org/viewvc?rev=1396578&view=rev
Log:
[KARAF-1906] Compile error using IBM JDK on JAAS module.
Added explicit casts for IBM JDK compatibility.
Modified:
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java
Modified: karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java?rev=1396578&r1=1396577&r2=1396578&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java (original)
+++ karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java Wed Oct 10 12:53:54 2012
@@ -25,6 +25,7 @@ import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
public class PropertiesBackingEngine implements BackingEngine {
@@ -70,7 +71,7 @@ public class PropertiesBackingEngine imp
}
}
- String userInfos = users.get(username);
+ String userInfos = (String) users.get(username);
//If user already exists, update password
if (userInfos != null && userInfos.length() > 0) {
@@ -117,7 +118,9 @@ public class PropertiesBackingEngine imp
public List<UserPrincipal> listUsers() {
List<UserPrincipal> result = new ArrayList<UserPrincipal>();
- for (String userNames : users.keySet()) {
+ Set<String> userSet = users.keySet();
+
+ for (String userNames : userSet) {
UserPrincipal userPrincipal = new UserPrincipal(userNames);
result.add(userPrincipal);
}
@@ -132,7 +135,7 @@ public class PropertiesBackingEngine imp
*/
public List<RolePrincipal> listRoles(UserPrincipal user) {
List<RolePrincipal> result = new ArrayList<RolePrincipal>();
- String userInfo = users.get(user.getName());
+ String userInfo = (String) users.get(user.getName());
String[] infos = userInfo.split(",");
for (int i = 1; i < infos.length; i++) {
result.add(new RolePrincipal(infos[i]));
@@ -147,7 +150,7 @@ public class PropertiesBackingEngine imp
* @param role
*/
public void addRole(String username, String role) {
- String userInfos = users.get(username);
+ String userInfos = (String) users.get(username);
if (userInfos != null) {
String newUserInfos = userInfos + "," + role;
users.put(username, newUserInfos);
@@ -169,7 +172,7 @@ public class PropertiesBackingEngine imp
String[] infos = null;
StringBuffer userInfoBuffer = new StringBuffer();
- String userInfos = users.get(username);
+ String userInfos = (String) users.get(username);
//If user already exists, remove the role
if (userInfos != null && userInfos.length() > 0) {
Modified: karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java?rev=1396578&r1=1396577&r2=1396578&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java (original)
+++ karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java Wed Oct 10 12:53:54 2012
@@ -83,7 +83,7 @@ public class PropertiesLoginModule exten
String userInfos = null;
try {
- userInfos = users.get(user);
+ userInfos = (String) users.get(user);
} catch (NullPointerException e) {
//error handled in the next statement
}
Modified: karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java?rev=1396578&r1=1396577&r2=1396578&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java (original)
+++ karaf/branches/karaf-2.3.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/publickey/PublickeyLoginModule.java Wed Oct 10 12:53:54 2012
@@ -92,7 +92,7 @@ public class PublickeyLoginModule extend
String userInfos = null;
try {
- userInfos = users.get(user);
+ userInfos = (String) users.get(user);
} catch (NullPointerException e) {
//error handled in the next statement
}