Put the serializability check in the right place!

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@1285 1c488680-804c-0410-94cd-c6b725194a0e
weld · Jan 29, 2009 · f688096 · f688096
1 parent 1bc2327
commit f688096
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java b/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java
@@ -200,11 +200,11 @@ protected void checkReturnValue(T instance)
       {
          return;
       }
-      if (isDependent() && Beans.isPassivatingBean(injectionPoint.getBean()) && !isSerializable())
+      if (isDependent() && Beans.isPassivatingBean(injectionPoint.getBean()))
       {
          if (injectionPoint.getMember() instanceof Field)
          {
-            if (!Reflections.isTransient(injectionPoint.getMember()))
+            if (!Reflections.isTransient(injectionPoint.getMember()) || !isSerializable())
             {
                throw new IllegalProductException("Dependent scoped producers cannot produce non-serializable instances for injection into non-transient fields of passivating beans\n\nProducer: " + this.toString() + "\nInjection Point: " + injectionPoint.toString());
             }