You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by do...@apache.org on 2008/09/03 13:37:27 UTC
svn commit: r691580 -
/incubator/empire-db/trunk/core/Empire-db/src/org/apache/empire/db/expr/column/DBCountExpr.java
Author: doebele
Date: Wed Sep 3 04:37:27 2008
New Revision: 691580
URL: http://svn.apache.org/viewvc?rev=691580&view=rev
Log:
EMPIREDB-8
Modified:
incubator/empire-db/trunk/core/Empire-db/src/org/apache/empire/db/expr/column/DBCountExpr.java
Modified: incubator/empire-db/trunk/core/Empire-db/src/org/apache/empire/db/expr/column/DBCountExpr.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/core/Empire-db/src/org/apache/empire/db/expr/column/DBCountExpr.java?rev=691580&r1=691579&r2=691580&view=diff
==============================================================================
--- incubator/empire-db/trunk/core/Empire-db/src/org/apache/empire/db/expr/column/DBCountExpr.java (original)
+++ incubator/empire-db/trunk/core/Empire-db/src/org/apache/empire/db/expr/column/DBCountExpr.java Wed Sep 3 04:37:27 2008
@@ -73,8 +73,9 @@
public DBDatabase getDatabase()
{
if (column!=null)
- column.getDatabase();
- return rowset.getDatabase();
+ return column.getDatabase();
+ else
+ return rowset.getDatabase();
}
/**
RE: svn commit: r691580 - /incubator/empire-db/trunk/core/Empire-db/src/org/apache/empire/db/expr/column/DBCountExpr.java
Posted by Matthew Bond <bo...@esteam.de>.
you could delete the else too. Must give a compiler warning "Unnecessary else" o.a.
___________________________________________
David Matthew Bond
Geschäftsführer
Tel. +49 7531 45716-10
Mobil +49 172 4138 354
E-Mail: bond@esteam.de <ma...@esteam.de>
ESTEAM Software GmbH
Blarerstraße 56
D-78462 Konstanz
Geschäftsführer: David Matthew Bond, Rainer Döbele
Sitz: Konstanz, Amtsgericht Freiburg HRB 381845
Internet: www.esteam.de <http://www.esteam.de/>
____________________________________________
________________________________
From: doebele@apache.org [mailto:doebele@apache.org]
Sent: Wed 03.09.2008 13:37
To: empire-db-commits@incubator.apache.org
Subject: svn commit: r691580 - /incubator/empire-db/trunk/core/Empire-db/src/org/apache/empire/db/expr/column/DBCountExpr.java
Author: doebele
Date: Wed Sep 3 04:37:27 2008
New Revision: 691580
URL: http://svn.apache.org/viewvc?rev=691580&view=rev
Log:
EMPIREDB-8
Modified:
incubator/empire-db/trunk/core/Empire-db/src/org/apache/empire/db/expr/column/DBCountExpr.java
Modified: incubator/empire-db/trunk/core/Empire-db/src/org/apache/empire/db/expr/column/DBCountExpr.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/core/Empire-db/src/org/apache/empire/db/expr/column/DBCountExpr.java?rev=691580&r1=691579&r2=691580&view=diff
==============================================================================
--- incubator/empire-db/trunk/core/Empire-db/src/org/apache/empire/db/expr/column/DBCountExpr.java (original)
+++ incubator/empire-db/trunk/core/Empire-db/src/org/apache/empire/db/expr/column/DBCountExpr.java Wed Sep 3 04:37:27 2008
@@ -73,8 +73,9 @@
public DBDatabase getDatabase()
{
if (column!=null)
- column.getDatabase();
- return rowset.getDatabase();
+ return column.getDatabase();
+ else
+ return rowset.getDatabase();
}
/**