[webbeans-commits] Webbeans SVN: r2374 - in ri/trunk/impl: src/main/java/org/jboss/webbeans and 1 other directories.

Author: peteroyle Date: 2009-04-09 18:27:45 -0400 (Thu, 09 Apr 2009) New Revision: 2374 Modified: ri/trunk/impl/ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java Log: Unserializable Dependency Exception indicates the problematic bean. ConversationEntry and ConversationImpl classes can use Conversation interface rather than ConversationImpl class. Property changes on: ri/trunk/impl ___________________________________________________________________ Name: svn:ignore - .classpath .project target cobertura.ser .settings test-output temp-testng-customsuite.xml ObjectStore + cobertura.ser nb-configuration.xml test-output .classpath .project target temp-testng-customsuite.xml ObjectStore .settings Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-04-09 22:12:48 UTC (rev 2373) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-04-09 22:27:45 UTC (rev 2374) @@ -126,7 +126,7 @@ } if (Beans.isPassivatingBean(bean, manager) && !resolvedBean.isSerializable() && resolvedBean.getScopeType().equals(Dependent.class)) { - throw new UnserializableDependencyException("The bean " + bean + " declares a passivating scopes but has non-serializable dependencies"); + throw new UnserializableDependencyException("The bean " + bean + " declares a passivating scopes but has non-serializable dependency: " + resolvedBean); } } if (bean instanceof RIBean && !(bean instanceof NewSimpleBean) && !(bean instanceof NewEnterpriseBean)) Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java 2009-04-09 22:12:48 UTC (rev 2373) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java 2009-04-09 22:27:45 UTC (rev 2374) @@ -20,6 +20,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; +import javax.context.Conversation; import javax.servlet.http.HttpSession; import org.jboss.webbeans.context.ConversationContext; @@ -37,7 +38,7 @@ private static LogProvider log = Logging.getLogProvider(ConversationEntry.class); // The conversation - private ConversationImpl conversation; + private Conversation conversation; // The handle to the asynchronous timeout task private Future<?> terminationHandle; // The lock for concurrent access prevention @@ -49,7 +50,7 @@ * @param cid The conversation ID * @param terminationHandle The timeout termination handle */ - protected ConversationEntry(ConversationImpl conversation, Future<?> terminationHandle) + protected ConversationEntry(Conversation conversation, Future<?> terminationHandle) { // conversation is a proxy so we need to make a "real" instance this.conversation = new ConversationImpl(conversation); @@ -65,7 +66,7 @@ * @param terminationHandle The timeout termination handle * @return A new conversation entry */ - public static ConversationEntry of(ConversationImpl conversation, Future<?> terminationHandle) + public static ConversationEntry of(Conversation conversation, Future<?> terminationHandle) { return new ConversationEntry(conversation, terminationHandle); } @@ -166,7 +167,7 @@ log.trace("Conversation " + conversation + " re-scheduled for termination"); } - public ConversationImpl getConversation() + public Conversation getConversation() { return conversation; } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java 2009-04-09 22:12:48 UTC (rev 2373) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java 2009-04-09 22:27:45 UTC (rev 2374) @@ -61,7 +61,7 @@ * * @param conversation The old conversation */ - public ConversationImpl(ConversationImpl conversation) + public ConversationImpl(Conversation conversation) { this.cid = conversation.getId(); this.longRunning = conversation.isLongRunning();