Merge remote-tracking branch 'origin/master'

2016-06-08 23:00:29 +08:00 · 2016-06-08 23:00:29 +08:00 · e1a3de2ab7
parent dda3411c26 8b9e741ac6
commit e1a3de2ab7
1 changed files with 1 additions and 1 deletions
--- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/MethodMatcher.java
+++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/MethodMatcher.java
@ -70,7 +70,7 @@ public abstract class MethodMatcher {
    public enum Modifier {
        Public, Default, Private, Protected;

-        private ElementMatcher elementMatcher() {
+        private ElementMatcher.Junction<MethodDescription> elementMatcher() {
            switch (this) {
                case Private: {
                    return isPrivate();