cvs commit: jakarta-turbine-torque/src/java/org/apache/torque/util BasePeer.java

[jmcnally]

jmcnally    01/12/26 14:12:53

  Modified:    src/java/org/apache/torque/util BasePeer.java
  Log:
  added Byte type
  rearranged a couple "else if" statements so that those that are more likely to be 
true are first.
  
  Revision  Changes    Path
  1.20      +13 -8     
jakarta-turbine-torque/src/java/org/apache/torque/util/BasePeer.java
  
  Index: BasePeer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/util/BasePeer.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- BasePeer.java     2001/12/10 02:59:54     1.19
  +++ BasePeer.java     2001/12/26 22:12:53     1.20
  @@ -110,7 +110,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
  - * @version $Id: BasePeer.java,v 1.19 2001/12/10 02:59:54 jmcnally Exp $
  + * @version $Id: BasePeer.java,v 1.20 2001/12/26 22:12:53 jmcnally Exp $
    */
   public abstract class BasePeer implements java.io.Serializable
   {
  @@ -879,10 +879,10 @@
                       rec.setValue( colMap.getColumnName(),
                                     (BigDecimal)obj );
                   }
  -                else if ( obj instanceof Long)
  +                else if ( obj instanceof Boolean)
                   {
                       rec.setValue( colMap.getColumnName(),
  -                                  criteria.getLong(key) );
  +                                   criteria.getBoolean(key) ? 1 : 0);
                   }
                   else if ( obj instanceof java.util.Date)
                   {
  @@ -899,6 +899,16 @@
                       rec.setValue( colMap.getColumnName(),
                                     criteria.getDouble(key) );
                   }
  +                else if ( obj instanceof Byte)
  +                {
  +                    rec.setValue( colMap.getColumnName(),
  +                                  ((Byte) obj).byteValue() );
  +                }
  +                else if ( obj instanceof Long)
  +                {
  +                    rec.setValue( colMap.getColumnName(),
  +                                  criteria.getLong(key) );
  +                }
                   else if ( obj instanceof Hashtable )
                   {
                       rec.setValue( colMap.getColumnName(),
  @@ -908,11 +918,6 @@
                   {
                       rec.setValue( colMap.getColumnName(),
                                     (byte[])obj);
  -                }
  -                else if ( obj instanceof Boolean)
  -                {
  -                    rec.setValue( colMap.getColumnName(),
  -                                   criteria.getBoolean(key) ? 1 : 0);
                   }
                   shouldSave = true;
                }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>