--- a/javacommons/security/javasrc/com/nokia/mj/impl/security/midp/authorization/PermissionResolver.java	Wed Sep 15 12:05:25 2010 +0300
+++ b/javacommons/security/javasrc/com/nokia/mj/impl/security/midp/authorization/PermissionResolver.java	Wed Oct 13 14:23:59 2010 +0300
@@ -203,7 +203,7 @@
                     // add new settings
                     newPermissionInstancesAndSettings.addElement(
                         new PermisionInstanceAndSettings(
-                            p.getPermissionInstance(),
+                            p.getPermissionInstance(), 
                             p.getType(),
                             newSettings));
                 }
@@ -678,15 +678,11 @@
                     // permission and the policy permission
                     String target = legacyPermission.getTarget();
                     if (target != null
-                        && !("*".equals(policyPermissions[i].getTarget()))
-                        && !target.equals(policyPermissions[i].getTarget()))
+                            && target.indexOf("*") == -1
+                            && !target.equals(policyPermissions[i].getTarget()))
                     {
                         continue;
                     }
-                    if (target == null)
-                    {
-                        target = policyPermissions[i].getTarget();
-                    }
                     // choose the action
                     String actionList = legacyPermission.getActionList();
                     if (actionList == null)
@@ -694,7 +690,7 @@
                         resolvedPermissions.addElement(
                             new PolicyBasedPermissionImpl(
                                 policyPermissions[i].getName(),
-                                target,
+                                policyPermissions[i].getTarget(),
                                 policyPermissions[i].getActionList(),
                                 policyPermissions[i].getUserSecuritySettings()));
                     }
@@ -706,7 +702,7 @@
                             resolvedPermissions.addElement(
                                 new PolicyBasedPermissionImpl(
                                     policyPermissions[i].getName(),
-                                    target,
+                                    policyPermissions[i].getTarget(),
                                     actionList,
                                     policyPermissions[i].getUserSecuritySettings()));
                         }
@@ -739,7 +735,7 @@
         {
             return settings;
         }
-
+        
         public int getType()
         {
             return type;