[seam-commits] Seam SVN: r12814 - in modules/security/trunk/impl/src/main/java/org/jboss/seam/security: permission and 1 other directories.

[seam-commits at lists.jboss.org]

Author: shane.bryzak at jboss.com
Date: 2010-05-26 10:37:17 -0400 (Wed, 26 May 2010)
New Revision: 12814

Modified:
   modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/action/RoleAction.java
   modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/JpaPermissionStore.java
   modules/security/trunk/impl/src/main/java/org/jboss/seam/security/util/AnnotatedBeanProperty.java
Log:
rethrow IllegalArgumentException and NPE


Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/action/RoleAction.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/action/RoleAction.java	2010-05-26 14:29:52 UTC (rev 12813)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/management/action/RoleAction.java	2010-05-26 14:37:17 UTC (rev 12814)
@@ -43,7 +43,7 @@
          //identityManager.deleteRole(originalRole);
       }
       
-      if (identityManager.roleExists(role))
+      if (identityManager.roleTypeExists(role))
       {
          return saveExistingRole();
       }

Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/JpaPermissionStore.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/JpaPermissionStore.java	2010-05-26 14:29:52 UTC (rev 12813)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/JpaPermissionStore.java	2010-05-26 14:37:17 UTC (rev 12814)
@@ -84,7 +84,7 @@
    
    protected void initProperties()
    {      
-      recipientProperty = new AnnotatedBeanProperty<PermissionRecipient>(userPermissionClass, PermissionRecipient.class);
+      /*recipientProperty = new AnnotatedBeanProperty<PermissionRecipient>(userPermissionClass, PermissionRecipient.class);
       targetProperty = new AnnotatedBeanProperty<PermissionTarget>(userPermissionClass, PermissionTarget.class);
       actionProperty = new AnnotatedBeanProperty<PermissionAction>(userPermissionClass, PermissionAction.class);
       
@@ -108,7 +108,7 @@
                   PermissionRecipientType.class);
          }
       }
-      
+      */
       if (!recipientProperty.isSet())
       {
          throw new RuntimeException("Invalid userPermissionClass " + userPermissionClass.getName() +
@@ -699,7 +699,7 @@
             
             if (targets != null)
             {
-               target = identifierCache.get(roleTargetProperty.getValue(permission));
+               //target = identifierCache.get(roleTargetProperty.getValue(permission));
                if (target != null)
                {
                   //actionSet = metadata.createActionSet(target.getClass(),

Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/util/AnnotatedBeanProperty.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/util/AnnotatedBeanProperty.java	2010-05-26 14:29:52 UTC (rev 12813)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/util/AnnotatedBeanProperty.java	2010-05-26 14:37:17 UTC (rev 12814)
@@ -281,15 +281,17 @@
       }
       catch (IllegalArgumentException ex)
       {
-         throw new RuntimeException(buildInvokeMethodErrorMessage(method, obj, args), ex);
+         throw new IllegalArgumentException(buildInvokeMethodErrorMessage(method, obj, args), ex.getCause()); 
       }
       catch (InvocationTargetException ex)
       {
          throw new RuntimeException(buildInvokeMethodErrorMessage(method, obj, args), ex);
       }
       catch (NullPointerException ex)
-      {
-         throw new RuntimeException(buildInvokeMethodErrorMessage(method, obj, args), ex);
+      {         
+         NullPointerException ex2 = new NullPointerException(buildInvokeMethodErrorMessage(method, obj, args));
+         ex2.initCause(ex.getCause());
+         throw ex2;
       }
       catch (ExceptionInInitializerError e)
       {