Resolves alibaba#256: Support parameters in entry of Sentinel annotat…

…ion support - To enable parameter flow control in Sentinel annotation support Signed-off-by: Eric Zhao <[email protected]> (cherry picked from commit 09ba7f0)
379675019 · Dec 25, 2018 · 41db7db · 41db7db
1 parent e2f92b4
commit 41db7db
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -37,7 +37,7 @@
     /**
      * @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/...ctj/src/main/java/com/alibaba/csp/sentinel/annotation/aspectj/SentinelResourceAspect.java b/...ctj/src/main/java/com/alibaba/csp/sentinel/annotation/aspectj/SentinelResourceAspect.java
@@ -53,7 +53,7 @@ public Object invokeResourceWithSentinel(ProceedingJoinPoint pjp) throws Throwab
         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) {