db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arm...@apache.org
Subject cvs commit: db-ojb/src/java/org/apache/ojb/broker/util BrokerHelper.java
Date Wed, 12 Mar 2003 11:08:48 GMT
arminw      2003/03/12 03:08:48

  Modified:    src/java/org/apache/ojb/broker/util BrokerHelper.java
  Log:
  repair //#ifdef JDK13
  
  Revision  Changes    Path
  1.16      +7 -6      db-ojb/src/java/org/apache/ojb/broker/util/BrokerHelper.java
  
  Index: BrokerHelper.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/BrokerHelper.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- BrokerHelper.java	10 Mar 2003 19:23:28 -0000	1.15
  +++ BrokerHelper.java	12 Mar 2003 11:08:48 -0000	1.16
  @@ -55,7 +55,6 @@
    */
   
   import java.lang.reflect.Field;
  -import java.lang.reflect.Proxy;
   import java.util.StringTokenizer;
   
   import org.apache.commons.lang.SystemUtils;
  @@ -73,6 +72,8 @@
   import org.apache.ojb.broker.metadata.fieldaccess.PersistentField;
   import org.apache.ojb.broker.singlevm.PersistenceBrokerConfiguration;
   import org.apache.ojb.broker.util.sequence.SequenceManagerException;
  +//#ifdef JDK13
  +import java.lang.reflect.Proxy;
   //#else
   /*
   import com.develop.java.lang.reflect.Proxy;
  @@ -208,7 +209,7 @@
                   FieldDescriptor fmd = pkFields[i];
                   PersistentField f = fmd.getPersistentField();
                   Object cv = f.get(objectOrProxy);
  -                
  +
                   // handle autoincrement attributes if not filled
                   if (fmd.isAutoIncrement())
                   {
  @@ -351,7 +352,7 @@
               FieldDescriptor fmd = nonPkFields[i];
               PersistentField f = fmd.getPersistentField();
               Object cv = f.get(o);
  -            
  +
               // handle autoincrement attributes if not filled
               if (fmd.isAutoIncrement())
               {
  @@ -359,12 +360,12 @@
                   // has a field conversion run on it
                   cv = getAutoIncrementValue(fmd, o, cv);
               }
  -            else 
  +            else
               {
                   // apply type and value conversion
                   cv = fmd.getFieldConversion().javaToSql(cv);
               }
  -            
  +
               result[i] = cv;
           }
           return result;
  
  
  

Mime
View raw message