Return-Path: Delivered-To: apmail-incubator-empire-db-dev-archive@locus.apache.org Received: (qmail 46131 invoked from network); 3 Sep 2008 14:53:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Sep 2008 14:53:49 -0000 Received: (qmail 15710 invoked by uid 500); 3 Sep 2008 14:53:47 -0000 Delivered-To: apmail-incubator-empire-db-dev-archive@incubator.apache.org Received: (qmail 15696 invoked by uid 500); 3 Sep 2008 14:53:47 -0000 Mailing-List: contact empire-db-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: empire-db-dev@incubator.apache.org Delivered-To: mailing list empire-db-dev@incubator.apache.org Received: (qmail 15684 invoked by uid 99); 3 Sep 2008 14:53:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Sep 2008 07:53:47 -0700 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [217.7.226.111] (HELO esteam.de) (217.7.226.111) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Sep 2008 14:52:48 +0000 Content-class: urn:content-classes:message Subject: RE: svn commit: r691580 - /incubator/empire-db/trunk/core/Empire-db/src/org/apache/empire/db/expr/column/DBCountExpr.java MIME-Version: 1.0 Date: Wed, 3 Sep 2008 16:52:23 +0200 Content-Type: multipart/mixed; boundary="----_=_NextPart_001_01C90DD4.C043BC74" Message-ID: <0864536CC6E70F4F9FF85DE7334908CC1BFF7F@esteams1.esteam.local> X-MimeOLE: Produced By Microsoft Exchange V6.5 X-MS-Has-Attach: X-MS-TNEF-Correlator: <0864536CC6E70F4F9FF85DE7334908CC1BFF7F@esteams1.esteam.local> Thread-Topic: svn commit: r691580 - /incubator/empire-db/trunk/core/Empire-db/src/org/apache/empire/db/expr/column/DBCountExpr.java Thread-Index: AckNuZCpyFuYIbRJRMCJgOoy8clfawAGxu/g References: <20080903113728.1304E238899E@eris.apache.org> From: "Matthew Bond" To: X-Virus-Checked: Checked by ClamAV on apache.org ------_=_NextPart_001_01C90DD4.C043BC74 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable you could delete the else too. Must give a compiler warning "Unnecessary = else" o.a. =20 =20 ___________________________________________ David Matthew Bond Gesch=E4ftsf=FChrer Tel. +49 7531 45716-10 Mobil +49 172 4138 354 E-Mail: bond@esteam.de =20 =20 ESTEAM Software GmbH Blarerstra=DFe 56 D-78462 Konstanz Gesch=E4ftsf=FChrer: David Matthew Bond, Rainer D=F6bele Sitz: Konstanz, Amtsgericht Freiburg HRB 381845 Internet: www.esteam.de =20 ____________________________________________ ________________________________ 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/c= olumn/DBCountExpr.java Author: doebele Date: Wed Sep 3 04:37:27 2008 New Revision: 691580 URL: http://svn.apache.org/viewvc?rev=3D691580&view=3Drev Log: EMPIREDB-8 Modified: = incubator/empire-db/trunk/core/Empire-db/src/org/apache/empire/db/expr/co= lumn/DBCountExpr.java Modified: = incubator/empire-db/trunk/core/Empire-db/src/org/apache/empire/db/expr/co= lumn/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=3D691580&r1=3D6915= 79&r2=3D691580&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- = incubator/empire-db/trunk/core/Empire-db/src/org/apache/empire/db/expr/co= lumn/DBCountExpr.java (original) +++ = incubator/empire-db/trunk/core/Empire-db/src/org/apache/empire/db/expr/co= lumn/DBCountExpr.java Wed Sep 3 04:37:27 2008 @@ -73,8 +73,9 @@ public DBDatabase getDatabase() { if (column!=3Dnull) - column.getDatabase(); - return rowset.getDatabase(); + return column.getDatabase(); + else + return rowset.getDatabase(); } /** ------_=_NextPart_001_01C90DD4.C043BC74--