Author: shane.bryzak(a)jboss.com Date: 2008-10-08 00:23:23 -0400 (Wed, 08 Oct 2008) New Revision: 9221 Modified: trunk/src/main/org/jboss/seam/security/permission/JpaPermissionStore.java trunk/src/main/org/jboss/seam/util/Work.java Log: oops, broke the build Modified: trunk/src/main/org/jboss/seam/security/permission/JpaPermissionStore.java =================================================================== --- trunk/src/main/org/jboss/seam/security/permission/JpaPermissionStore.java 2008-10-08 03:50:08 UTC (rev 9220) +++ trunk/src/main/org/jboss/seam/security/permission/JpaPermissionStore.java 2008-10-08 04:23:23 UTC (rev 9221) @@ -529,11 +529,11 @@ if (identityStore != null) { - if (recipientIsRole && roleProperty.isSet() && roleProperty.getPropertyClass().equals(identityStore.getRoleClass())) + if (recipientIsRole && roleProperty.isSet() && roleProperty.getPropertyType().equals(identityStore.getRoleClass())) { return identityStore.lookupRole(recipient.getName()); } - else if (userProperty.getPropertyClass().equals(identityStore.getUserClass())) + else if (userProperty.getPropertyType().equals(identityStore.getUserClass())) { return identityStore.lookupUser(recipient.getName()); } Modified: trunk/src/main/org/jboss/seam/util/Work.java =================================================================== --- trunk/src/main/org/jboss/seam/util/Work.java 2008-10-08 03:50:08 UTC (rev 9220) +++ trunk/src/main/org/jboss/seam/util/Work.java 2008-10-08 04:23:23 UTC (rev 9221) @@ -30,7 +30,7 @@ } public final T workInTransaction() throws Exception - { + { boolean transactionActive = Transaction.instance().isActiveOrMarkedRollback() || Transaction.instance().isRolledBack(); //TODO: temp workaround, what should we really do in this case?? boolean newTransactionRequired = isNewTransactionRequired(transactionActive);