Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge remote-tracking branch 'marius/WELD-853-REDUX' into marius_2012…
…0306
  • Loading branch information
alesj committed Mar 6, 2012
2 parents adc4dd0 + eabbb76 commit 838218a
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
Expand Up @@ -85,6 +85,7 @@
import static org.jboss.weld.logging.messages.BeanMessage.INVOCATION_ERROR;
import static org.jboss.weld.logging.messages.BeanMessage.ONLY_ONE_SCOPE_ALLOWED;
import static org.jboss.weld.logging.messages.BeanMessage.PARAMETER_ANNOTATION_NOT_ALLOWED_ON_CONSTRUCTOR;
import static org.jboss.weld.logging.messages.BeanMessage.PARAM_NOT_IN_PARAM_LIST;
import static org.jboss.weld.logging.messages.BeanMessage.PROXY_INSTANTIATION_FAILED;
import static org.jboss.weld.logging.messages.BeanMessage.SPECIALIZING_BEAN_MUST_EXTEND_A_BEAN;
import static org.jboss.weld.logging.messages.BeanMessage.USING_DEFAULT_SCOPE;
Expand Down Expand Up @@ -130,7 +131,13 @@ protected static Set<Annotation> flattenInterceptorBindings(BeanManagerImpl bean
for (Interceptor<?> interceptor : interceptors) {

SerializableContextualImpl<Interceptor<?>, ?> contextual = new SerializableContextualImpl(interceptor, getServices().get(ContextualStore.class));
serializableContextuals.add(beanManager.getInterceptorMetadataReader().getInterceptorMetadata(new SerializableContextualInterceptorReference(contextual, beanManager.getInterceptorMetadataReader().getClassMetadata(interceptor.getBeanClass()))));
if (interceptor instanceof InterceptorImpl) {
serializableContextuals.add(beanManager.getInterceptorMetadataReader().getInterceptorMetadata(new SerializableContextualInterceptorReference(contextual, WeldInterceptorClassMetadata.of(((InterceptorImpl) interceptor).getWeldAnnotated()))));
} else {
// TODO - fix custom interception
// custom interceptor - read metadata reflectively
serializableContextuals.add(beanManager.getInterceptorMetadataReader().getInterceptorMetadata(new SerializableContextualInterceptorReference(contextual, beanManager.getInterceptorMetadataReader().getClassMetadata(interceptor.getBeanClass()))));
}
}
return serializableContextuals.toArray(AbstractClassBean.<SerializableContextual<?, ?>>emptyInterceptorMetadataArray());
}
Expand Down
3 changes: 3 additions & 0 deletions impl/src/main/java/org/jboss/weld/bean/InterceptorImpl.java
Expand Up @@ -17,8 +17,10 @@

package org.jboss.weld.bean;

import org.jboss.weld.bean.interceptor.SerializableContextualInterceptorReference;
import org.jboss.weld.bean.interceptor.WeldInterceptorClassMetadata;
import org.jboss.weld.bootstrap.api.ServiceRegistry;
import org.jboss.weld.context.SerializableContextualImpl;
import org.jboss.weld.exceptions.DeploymentException;
import org.jboss.weld.exceptions.WeldException;
import org.jboss.weld.interceptor.proxy.InterceptorInvocation;
Expand All @@ -27,6 +29,7 @@
import org.jboss.weld.interceptor.spi.metadata.InterceptorMetadata;
import org.jboss.weld.introspector.WeldClass;
import org.jboss.weld.manager.BeanManagerImpl;
import org.jboss.weld.serialization.spi.helpers.SerializableContextual;
import org.jboss.weld.util.Beans;
import org.jboss.weld.util.reflection.Formats;

Expand Down
Expand Up @@ -16,7 +16,6 @@
*/
package org.jboss.weld.tests.extensions.interceptors;

import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;

/**
Expand All @@ -27,7 +26,6 @@
public class IncrementingInterceptor {
private static boolean doAroundCalled = false;

@AroundInvoke
public Object doAround(InvocationContext context) throws Exception {
doAroundCalled = true;
Integer res = (Integer) context.proceed();
Expand Down
Expand Up @@ -27,12 +27,10 @@ public class LifecycleInterceptor {
static private boolean preDestroyCalled = false;
static private boolean postConstructCalled = false;

@PreDestroy
public void preDestroy(InvocationContext ctx) {
preDestroyCalled = true;
}

@PostConstruct
public void postConstruct(InvocationContext ctx) {
Object marathon = ctx.getTarget();
if (marathon instanceof Marathon) {
Expand Down

0 comments on commit 838218a

Please sign in to comment.