This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 7c241e8da1d78c846c483c8ed6a8c935b8433689 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 19 01:25:20 2015 +0200 Amélioration code: ne pas recalculer si une annotation est présente plusieurs fois --- .../observe/services/ObserveServiceFactoryTopia.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java index 9220b3f..4b06b7b 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java @@ -194,19 +194,23 @@ public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport { } - if (method.isAnnotationPresent(ReadDataPermission.class) - || method.isAnnotationPresent(WriteDataPermission.class) - || method.isAnnotationPresent(ReadReferentialPermission.class) - || method.isAnnotationPresent(WriteReferentialPermission.class)) { + boolean readDataPermissionPresent = method.isAnnotationPresent(ReadDataPermission.class); + boolean writeDataPermissionPresent = method.isAnnotationPresent(WriteDataPermission.class); + boolean readReferentialPermissionPresent = method.isAnnotationPresent(ReadReferentialPermission.class); + boolean writeReferentialPermissionPresent = method.isAnnotationPresent(WriteReferentialPermission.class); + if (readDataPermissionPresent + || writeDataPermissionPresent + || readReferentialPermissionPresent + || writeReferentialPermissionPresent) { if (serviceContext.withDataSourceConnection()) { ObserveDataSourceConnectionTopia dataSourceConnection = serviceContext.getDataSourceConnection(); - if (method.isAnnotationPresent(ReadDataPermission.class) && !dataSourceConnection.canReadData() - || method.isAnnotationPresent(WriteDataPermission.class) && !dataSourceConnection.canWriteData() - || method.isAnnotationPresent(ReadReferentialPermission.class) && !dataSourceConnection.canReadReferential() - || method.isAnnotationPresent(WriteReferentialPermission.class) && !dataSourceConnection.canWriteReferential()) { + if (readDataPermissionPresent && !dataSourceConnection.canReadData() + || writeDataPermissionPresent && !dataSourceConnection.canWriteData() + || readReferentialPermissionPresent && !dataSourceConnection.canReadReferential() + || writeReferentialPermissionPresent && !dataSourceConnection.canWriteReferential()) { throw new UnauthorizedException(method.getClass().getCanonicalName(), method.getName()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.