From 09ba7f081bf039da7db0b6ad355b7737912d1245 Mon Sep 17 00:00:00 2001 From: Eric Zhao Date: Wed, 21 Nov 2018 16:46:55 +0800 Subject: [PATCH] Resolves #256: Support parameters in entry of Sentinel annotation support - To enable parameter flow control in Sentinel annotation support Signed-off-by: Eric Zhao --- .../com/alibaba/csp/sentinel/annotation/SentinelResource.java | 2 +- .../csp/sentinel/annotation/aspectj/SentinelResourceAspect.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sentinel-core/src/main/java/com/alibaba/csp/sentinel/annotation/SentinelResource.java b/sentinel-core/src/main/java/com/alibaba/csp/sentinel/annotation/SentinelResource.java index f69f5fe8..78274443 100644 --- a/sentinel-core/src/main/java/com/alibaba/csp/sentinel/annotation/SentinelResource.java +++ b/sentinel-core/src/main/java/com/alibaba/csp/sentinel/annotation/SentinelResource.java @@ -37,7 +37,7 @@ public @interface SentinelResource { /** * @return name of the Sentinel resource */ - String value() default "";; + String value() default ""; /** * @return the entry type (inbound or outbound), outbound by default diff --git a/sentinel-extension/sentinel-annotation-aspectj/src/main/java/com/alibaba/csp/sentinel/annotation/aspectj/SentinelResourceAspect.java b/sentinel-extension/sentinel-annotation-aspectj/src/main/java/com/alibaba/csp/sentinel/annotation/aspectj/SentinelResourceAspect.java index 83a1f590..7f2285e5 100644 --- a/sentinel-extension/sentinel-annotation-aspectj/src/main/java/com/alibaba/csp/sentinel/annotation/aspectj/SentinelResourceAspect.java +++ b/sentinel-extension/sentinel-annotation-aspectj/src/main/java/com/alibaba/csp/sentinel/annotation/aspectj/SentinelResourceAspect.java @@ -53,7 +53,7 @@ public class SentinelResourceAspect extends AbstractSentinelAspectSupport { EntryType entryType = annotation.entryType(); Entry entry = null; try { - entry = SphU.entry(resourceName, entryType); + entry = SphU.entry(resourceName, entryType, 1, pjp.getArgs()); Object result = pjp.proceed(); return result; } catch (BlockException ex) {