[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jboss-cvs-commits
Subject:    [jboss-cvs] jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata JDBCCMPFieldMetaData.java
From:       Alexey Loubyansky <loubyansky () users ! sourceforge ! net>
Date:       2004-06-30 11:40:37
Message-ID: E1BfdS9-0000Vw-3K () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]

  User: loubyansky
  Date: 04/06/30 04:40:37

  Modified:    src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata Tag:
                        Branch_3_2 JDBCCMPFieldMetaData.java
  Log:
  if a pk field was found more than once in the pk class hierarchy log a warning, use \
the one that is declared in the pk class, otherwise use any.  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.8.2.13  +23 -8     \
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCCMPFieldMetaData.java  
  Index: JDBCCMPFieldMetaData.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCCMPFieldMetaData.java,v
  retrieving revision 1.8.2.12
  retrieving revision 1.8.2.13
  diff -u -r1.8.2.12 -r1.8.2.13
  --- JDBCCMPFieldMetaData.java	5 Feb 2004 17:06:36 -0000	1.8.2.12
  +++ JDBCCMPFieldMetaData.java	30 Jun 2004 11:40:32 -0000	1.8.2.13
  @@ -31,7 +31,7 @@
    * @author <a href="mailto:loubyansky@hotmail.com">Alex Loubyansky</a>
    * @author <a href="mailto:heiko.rupp@cellent.de">Heiko W.Rupp</a>
    *
  - * @version $Revision: 1.8.2.12 $
  + * @version $Revision: 1.8.2.13 $
    */
   public final class JDBCCMPFieldMetaData
   {
  @@ -179,8 +179,7 @@
               // verify field type
               if(!entity.getPrimaryKeyClass().equals(fieldType))
               {
  -               throw new DeploymentException("primkey-field must be the " +
  -                  "same type as prim-key-class");
  +               throw new DeploymentException("primkey-field must be the same type \
as prim-key-class");  }
               // we are the pk
               primaryKeyMember = true;
  @@ -199,19 +198,35 @@
            Field pkField = null;
            for(int i = 0; i < fields.length; i++)
            {
  -            if(fields[i].getName().equals(fieldName))
  +            final Field field = fields[i];
  +            if(field.getName().equals(fieldName))
               {
   
                  // verify field type
  -               if(!fields[i].getType().equals(fieldType))
  +               if(!field.getType().equals(fieldType))
                  {
  -                  throw new DeploymentException("Field " + fieldName +
  -                     " in prim-key-class must be the same type");
  +                  throw new DeploymentException("Field " + fieldName + " in \
prim-key-class must be of the same type.");  +               }
  +
  +               if(pkField != null)
  +               {
  +                  \
if(field.getDeclaringClass().equals(entity.getPrimaryKeyClass()))  +                  \
{  +                     pkField = field;
  +                  }
  +
  +                  org.jboss.logging.Logger.getLogger(getClass().getName() + '.' + \
entity.getName()).warn(  +                     "PK field " + fieldName + " was found \
more than once in class hierarchy of " +  +                     \
entity.getPrimaryKeyClass().getName() + ". Will use the one from " + \
pkField.getDeclaringClass().getName()  +                  );
  +               }
  +               else
  +               {
  +                  pkField = field;
                  }
   
                  // we are a pk member
                  pkMember = true;
  -               pkField = fields[i];
               }
            }
            primaryKeyMember = pkMember;
  
  
  


-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
jboss-cvs-commits mailing list
jboss-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jboss-cvs-commits


[prev in list] [next in list] [prev in thread] [next in thread]