John/Jon

Here is the patch, as I see it.  I've tried the sample app and my app using it - 
although not using the new functionality - thats the next step...

Chris


Index: java/org/apache/turbine/om/user/TurbineUser.java
===================================================================
RCS file: 
/products/cvs/turbine/turbine/src/java/org/apache/turbine/om/user/TurbineUser.java,v
retrieving revision 1.2
diff -r1.2 TurbineUser.java
347c347
<         Vector users = TurbineUserPeer.doSelect(criteria);
---
>         Vector users = TurbineUserPeer.doSelect(criteria, this);
354c354
<             return (User) users.firstElement();
---
>             return this;
365c365
<         Vector users = TurbineUserPeer.doSelect(criteria);
---
>         Vector users = TurbineUserPeer.doSelect(criteria, this);
372c372
<             return (User) users.firstElement();
---
>             return this;
cvs server: Diffing java/org/apache/turbine/om/user/peer
Index: java/org/apache/turbine/om/user/peer/TurbineUserPeer.java
===================================================================
RCS file: 
/products/cvs/turbine/turbine/src/java/org/apache/turbine/om/user/peer/TurbineUserPeer.java,v
retrieving revision 1.11
diff -r1.11 TurbineUserPeer.java
84a85
>  * @version $Id$
165c166
<     }
---
>     }
191a193,201
>         return doSelect(criteria,null);
>     }
>     /**
>      * @param Criteria object containing data that is used to create the SELECT 
>statement.
>      * @param current user object that is to be used as part of the results - if not 
>passed, then a new one is created
>      * @return Vector containing Show objects.
>      */
>     public static Vector doSelect(Criteria criteria, User current) throws Exception
>     {
231c241,245
<             User obj = UserFactory.getUser();
---
>           User obj = null;
>             if (i==0 && current != null)
>               obj = current;
>           else
>                 obj = UserFactory.getUser();
"There is no spoon"
______________________________________________
FREE Personalized Email at Mail.com
Sign up at http://www.mail.com/?sr=signup



------------------------------------------------------------
To subscribe:        [EMAIL PROTECTED]
To unsubscribe:      [EMAIL PROTECTED]
Problems?:           [EMAIL PROTECTED]

Reply via email to