User: dsundstrom
  Date: 02/04/11 17:43:12

  Modified:    src/main/org/jboss/ejb/plugins/cmp/jdbc/bridge
                        JDBCCMRFieldBridge.java
  Log:
  Fixed bug [ 533462 ] Relation: child entity always returned.
  Was mis-handling null values inconjuction with cutom primary key types that
  map a primitive value.
  
  Revision  Changes    Path
  1.29      +7 -2      
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/bridge/JDBCCMRFieldBridge.java
  
  Index: JDBCCMRFieldBridge.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/bridge/JDBCCMRFieldBridge.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- JDBCCMRFieldBridge.java   11 Apr 2002 16:39:21 -0000      1.28
  +++ JDBCCMRFieldBridge.java   12 Apr 2002 00:43:11 -0000      1.29
  @@ -56,7 +56,7 @@
    *      One for each role that entity has.       
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Dain Sundstrom</a>
  - * @version $Revision: 1.28 $
  + * @version $Revision: 1.29 $
    */                            
   public class JDBCCMRFieldBridge implements JDBCFieldBridge, CMRFieldBridge {
      // ------ Invocation messages ------
  @@ -1005,9 +1005,14 @@
            return parameterIndex;
         }
   
  +      Object fk = null;
  +      Collection c = getFieldState(ctx).getValue();
  +      if(c.size() > 0) {
  +         fk = c.iterator().next();
  +      }
         for(Iterator fields = foreignKeyFields.iterator(); fields.hasNext();) {
            JDBCCMPFieldBridge field = (JDBCCMPFieldBridge)fields.next();
  -         parameterIndex = field.setInstanceParameters(ps, parameterIndex, ctx);
  +         parameterIndex = field.setPrimaryKeyParameters(ps, parameterIndex, fk);
         }
         return parameterIndex;
      }
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to