[jboss-cvs] jboss-seam/src/main/org/jboss/seam/contexts ...

[Gavin King]

  User: gavin   
  Date: 07/06/16 14:34:28

  Modified:    src/main/org/jboss/seam/contexts   EntityBean.java
                        ServerConversationContext.java
  Log:
  JBSEAM-586
  
  Revision  Changes    Path
  1.9       +1 -2      jboss-seam/src/main/org/jboss/seam/contexts/EntityBean.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EntityBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/EntityBean.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- EntityBean.java	16 Jun 2007 16:30:13 -0000	1.8
  +++ EntityBean.java	16 Jun 2007 18:34:28 -0000	1.9
  @@ -1,6 +1,5 @@
   package org.jboss.seam.contexts;
   
  -import org.jboss.seam.core.Mutable;
   
   /**
    * Swizzles entities held in the conversation context at
  @@ -11,7 +10,7 @@
    * @author Gavin King
    *
    */
  -public class EntityBean implements Mutable
  +public class EntityBean implements Wrapper
   {
      private static final long serialVersionUID = -2884601453783925804L;
      
  
  
  
  1.26      +6 -2      jboss-seam/src/main/org/jboss/seam/contexts/ServerConversationContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerConversationContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/ServerConversationContext.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -b -r1.25 -r1.26
  --- ServerConversationContext.java	10 Jun 2007 20:44:19 -0000	1.25
  +++ ServerConversationContext.java	16 Jun 2007 18:34:28 -0000	1.26
  @@ -134,9 +134,9 @@
      private Object unwrapEntityBean(Object result)
      {
         if (result==null) return null;
  -      if ( result instanceof EntityBean )
  +      if ( result instanceof Wrapper )
         {
  -         return ( (EntityBean) result ).getInstance();
  +         return ( (Wrapper) result ).getInstance();
         }
         else
         {
  @@ -159,6 +159,10 @@
            {
               value = new EntityBean(value);
            }
  +         else if ( value instanceof List )
  +         {
  +            value = new EntityBeanList( (List) value );
  +         }
            additions.put(name, value);
         }
         if ( Events.exists() ) Events.instance().raiseEvent("org.jboss.seam.postSetVariable." + name);