User: dsundstrom
  Date: 02/02/12 10:06:40

  Modified:    src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata
                        JDBCQlQueryMetaData.java
                        JDBCQueryMetaDataFactory.java
  Log:
  Fixed bug reported in patch [#514347] JDBCQueryMetaDataFactory query fix.
  
  Revision  Changes    Path
  1.7       +1 -5      
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCQlQueryMetaData.java
  
  Index: JDBCQlQueryMetaData.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCQlQueryMetaData.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JDBCQlQueryMetaData.java  1 Nov 2001 22:11:26 -0000       1.6
  +++ JDBCQlQueryMetaData.java  12 Feb 2002 18:06:39 -0000      1.7
  @@ -8,13 +8,12 @@
   
   import java.lang.reflect.Method;
   import org.jboss.metadata.QueryMetaData;
  -import org.w3c.dom.Element;
   
   /**
    * Immutable class which contains information about an EJB QL query.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Dain Sundstrom</a>
  - * @version $Revision: 1.6 $
  + * @version $Revision: 1.7 $
    */
   public final class JDBCQlQueryMetaData implements JDBCQueryMetaData {
      /**
  @@ -56,12 +55,9 @@
       * Constructs a JDBCQlQueryMetaData with data from the jdbcQueryMetaData
       * and additional data from the xml element
       * @param queryMetaData the metadata about this query
  -    * @param queryElement the ejb-ql element which contains additional
  -    *    information about this query
       */
      public JDBCQlQueryMetaData(
            JDBCQlQueryMetaData jdbcQueryMetaData,
  -         Element queryElement,
            Method method,
            JDBCReadAheadMetaData readAhead) {
         
  
  
  
  1.10      +3 -5      
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCQueryMetaDataFactory.java
  
  Index: JDBCQueryMetaDataFactory.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCQueryMetaDataFactory.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- JDBCQueryMetaDataFactory.java     15 Jan 2002 21:18:41 -0000      1.9
  +++ JDBCQueryMetaDataFactory.java     12 Feb 2002 18:06:39 -0000      1.10
  @@ -24,7 +24,7 @@
    * on the query specifiection type.
    *    
    * @author <a href="mailto:[EMAIL PROTECTED]";>Dain Sundstrom</a>
  - * @version $Revision: 1.9 $
  + * @version $Revision: 1.10 $
    */
   public class JDBCQueryMetaDataFactory {
      private JDBCEntityMetaData entity;
  @@ -103,12 +103,10 @@
                  readAhead);
         }
   
  -      // EJB-QL
  -      Element ejbQl = MetaData.getOptionalChild(queryElement, "ejb-ql");
  -      if(ejbQl != null) {
  +      // EJB-QL: default
  +      if(jdbcQueryMetaData instanceof JDBCQlQueryMetaData) {
            return new JDBCQlQueryMetaData(
                  (JDBCQlQueryMetaData)jdbcQueryMetaData,
  -               ejbQl,
                  method,
                  readAhead);
         }
  
  
  

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

Reply via email to