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