You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by ta...@apache.org on 2018/05/02 08:34:53 UTC
deltaspike git commit: DELTASPIKE-1339
Repository: deltaspike
Updated Branches:
refs/heads/deltaspike-1.8.x 9429dd07c -> 50716b66a
DELTASPIKE-1339
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/50716b66
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/50716b66
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/50716b66
Branch: refs/heads/deltaspike-1.8.x
Commit: 50716b66a0fc7ec75ece948dd513840e324db228
Parents: 9429dd0
Author: Thomas Andraschko <ta...@apache.org>
Authored: Wed May 2 10:34:47 2018 +0200
Committer: Thomas Andraschko <ta...@apache.org>
Committed: Wed May 2 10:34:47 2018 +0200
----------------------------------------------------------------------
.../org/apache/deltaspike/proxy/api/DeltaSpikeProxyFactory.java | 4 +---
.../proxy/spi/invocation/DeltaSpikeProxyInterceptorLookup.java | 5 ++---
.../proxy/spi/invocation/DeltaSpikeProxyInvocationContext.java | 2 +-
3 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/50716b66/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/api/DeltaSpikeProxyFactory.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/api/DeltaSpikeProxyFactory.java b/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/api/DeltaSpikeProxyFactory.java
index dd41c83..1ee91dd 100644
--- a/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/api/DeltaSpikeProxyFactory.java
+++ b/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/api/DeltaSpikeProxyFactory.java
@@ -26,8 +26,6 @@ import java.util.Iterator;
import java.util.List;
import javax.enterprise.inject.spi.BeanManager;
-import javax.interceptor.InterceptorBinding;
-
import org.apache.deltaspike.core.util.ClassUtils;
import org.apache.deltaspike.core.util.ReflectionUtils;
import org.apache.deltaspike.proxy.spi.DeltaSpikeProxyClassGenerator;
@@ -107,7 +105,7 @@ public abstract class DeltaSpikeProxyFactory
{
Class<? extends Annotation> annotationType = annotation.annotationType();
- if (annotationType.isAnnotationPresent(InterceptorBinding.class))
+ if (beanManager.isInterceptorBinding(annotationType))
{
return true;
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/50716b66/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/spi/invocation/DeltaSpikeProxyInterceptorLookup.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/spi/invocation/DeltaSpikeProxyInterceptorLookup.java b/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/spi/invocation/DeltaSpikeProxyInterceptorLookup.java
index 0bd23ff..1c32d81 100644
--- a/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/spi/invocation/DeltaSpikeProxyInterceptorLookup.java
+++ b/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/spi/invocation/DeltaSpikeProxyInterceptorLookup.java
@@ -28,7 +28,6 @@ import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.InterceptionType;
import javax.enterprise.inject.spi.Interceptor;
-import javax.interceptor.InterceptorBinding;
import org.apache.deltaspike.core.api.provider.BeanManagerProvider;
/**
@@ -87,7 +86,7 @@ public class DeltaSpikeProxyInterceptorLookup
Class<? extends Annotation> annotationType = annotation.annotationType();
- if (annotationType.isAnnotationPresent(InterceptorBinding.class))
+ if (beanManager.isInterceptorBinding(annotationType))
{
bindings.add(annotation);
}
@@ -101,7 +100,7 @@ public class DeltaSpikeProxyInterceptorLookup
continue;
}
- if (subAnnotation.annotationType().isAnnotationPresent(InterceptorBinding.class))
+ if (beanManager.isInterceptorBinding(subAnnotation.annotationType()))
{
bindings.add(subAnnotation);
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/50716b66/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/spi/invocation/DeltaSpikeProxyInvocationContext.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/spi/invocation/DeltaSpikeProxyInvocationContext.java b/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/spi/invocation/DeltaSpikeProxyInvocationContext.java
index c99b4bb..5177b83 100644
--- a/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/spi/invocation/DeltaSpikeProxyInvocationContext.java
+++ b/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/spi/invocation/DeltaSpikeProxyInvocationContext.java
@@ -110,7 +110,7 @@ public class DeltaSpikeProxyInvocationContext<T, H> extends AbstractInvocationCo
throw new DeltaSpikeProxyInvocationWrapperException(e);
}
- return null;
+ return proceedOriginalReturnValue;
}
public boolean isProceedOriginal()