svn commit: r1541424 - in /karaf/branches/karaf-2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties: PropertiesBackingEngine.java PropertiesLoginModule.java

[jb...@apache.org]

Author: jbonofre
Date: Wed Nov 13 08:46:41 2013
New Revision: 1541424

URL: http://svn.apache.org/r1541424
Log:
[KARAF-2567] Fix compilation error with Java 7

Modified:
    karaf/branches/karaf-2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
    karaf/branches/karaf-2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java

Modified: karaf/branches/karaf-2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java?rev=1541424&r1=1541423&r2=1541424&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java (original)
+++ karaf/branches/karaf-2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesBackingEngine.java Wed Nov 13 08:46:41 2013
@@ -75,7 +75,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) {
@@ -142,7 +142,7 @@ public class PropertiesBackingEngine imp
 
     private List<RolePrincipal> listRoles(String name) {
         List<RolePrincipal> result = new ArrayList<RolePrincipal>();
-        String userInfo = users.get(name);
+        String userInfo = (String) users.get(name);
         String[] infos = userInfo.split(",");
         for (int i = 1; i < infos.length; i++) {
             String roleName = infos[i];
@@ -164,7 +164,7 @@ public class PropertiesBackingEngine imp
 
     @Override
     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);
@@ -181,7 +181,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) {
@@ -214,7 +214,7 @@ public class PropertiesBackingEngine imp
 
     private List<GroupPrincipal> listGroups(String userName) {
         List<GroupPrincipal> result = new ArrayList<GroupPrincipal>();
-        String userInfo = users.get(userName);
+        String userInfo = (String) users.get(userName);
         String[] infos = userInfo.split(",");
         for (int i = 1; i < infos.length; i++) {
             String name = infos[i];

Modified: karaf/branches/karaf-2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java?rev=1541424&r1=1541423&r2=1541424&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java (original)
+++ karaf/branches/karaf-2.x/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java Wed Nov 13 08:46:41 2013
@@ -95,7 +95,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
         }
@@ -162,7 +162,7 @@ public class PropertiesLoginModule exten
             if (infos[i].startsWith(PropertiesBackingEngine.GROUP_PREFIX)) {
                 // It's a group reference
                 principals.add(new GroupPrincipal(infos[i].substring(PropertiesBackingEngine.GROUP_PREFIX.length())));
-                String groupInfo = users.get(infos[i]);
+                String groupInfo = (String) users.get(infos[i]);
                 if (groupInfo != null) {
                     String[] roles = groupInfo.split(",");
                     for (int j = 1; j < roles.length; j++) {