[jBoss-Dev] CVS update:jboss/src/main/org/jboss/ejb/plugins/jaws/jdbcJDBCDefinedFinderCommand.java

[jBoss CVS Development]

  User: salborini
  Date: 00/09/25 12:15:41

  Modified:    src/main/org/jboss/ejb/plugins/jaws/jdbc
                        JDBCDefinedFinderCommand.java
  Log:
  Allow empty <order> tag in defined finders.
  
  Revision  Changes    Path
  1.4       +3 -3      
jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCDefinedFinderCommand.java
  
  Index: JDBCDefinedFinderCommand.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCDefinedFinderCommand.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JDBCDefinedFinderCommand.java     2000/09/09 02:52:56     1.3
  +++ JDBCDefinedFinderCommand.java     2000/09/25 19:15:41     1.4
  @@ -22,7 +22,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Joe Shevland</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Justin Forder</a>
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    */
   public class JDBCDefinedFinderCommand extends JDBCFinderCommand
   {
  @@ -61,9 +61,9 @@
         
         // Construct SQL
         String sql = "SELECT " + getPkColumnList() +
  -         (f.getOrder().equals("") ? "" : ","+f.getOrder()) + 
  +         (f.getOrder() == null || f.getOrder().equals("") ? "" : ","+f.getOrder()) 
+ 
            " FROM " + jawsEntity.getTableName() + " WHERE " + query;
  -      if (!f.getOrder().equals(""))
  +      if (f.getOrder() != null && !f.getOrder().equals(""))
         {
            sql += " ORDER BY "+f.getOrder();
         }