Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 34367 invoked from network); 18 May 2006 11:05:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 18 May 2006 11:05:29 -0000 Received: (qmail 50535 invoked by uid 500); 18 May 2006 11:05:29 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 50480 invoked by uid 500); 18 May 2006 11:05:28 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 50456 invoked by uid 99); 18 May 2006 11:05:28 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 May 2006 04:05:28 -0700 X-ASF-Spam-Status: No, hits=0.6 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 May 2006 04:05:27 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 8C4C71A9835; Thu, 18 May 2006 04:05:07 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r407519 - in /db/derby/code/branches/10.1/java: client/org/apache/derby/client/am/CrossConverters.java engine/org/apache/derby/iapi/types/SQLDouble.java Date: Thu, 18 May 2006 11:05:07 -0000 To: derby-commits@db.apache.org From: bernt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060518110507.8C4C71A9835@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: bernt Date: Thu May 18 04:05:06 2006 New Revision: 407519 URL: http://svn.apache.org/viewvc?rev=407519&view=rev Log: DERBY-1136 Merge command: svn merge -r 388160:388161 https://svn.apache.org/repos/asf/db/derby/code/trunk Originally submitted by Håvard Mork Modified: db/derby/code/branches/10.1/java/client/org/apache/derby/client/am/CrossConverters.java db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/types/SQLDouble.java Modified: db/derby/code/branches/10.1/java/client/org/apache/derby/client/am/CrossConverters.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/client/org/apache/derby/client/am/CrossConverters.java?rev=407519&r1=407518&r2=407519&view=diff ============================================================================== --- db/derby/code/branches/10.1/java/client/org/apache/derby/client/am/CrossConverters.java (original) +++ db/derby/code/branches/10.1/java/client/org/apache/derby/client/am/CrossConverters.java Thu May 18 04:05:06 2006 @@ -1074,7 +1074,7 @@ final float getFloatFromDouble(double source) throws SqlException { if (Configuration.rangeCheckCrossConverters && - (source > Float.MAX_VALUE || source < -Float.MAX_VALUE)) { + Float.isInfinite((float)source)) { throw new LossOfPrecisionConversionException(agent_.logWriter_, String.valueOf(source)); } Modified: db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/types/SQLDouble.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/types/SQLDouble.java?rev=407519&r1=407518&r2=407519&view=diff ============================================================================== --- db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/types/SQLDouble.java (original) +++ db/derby/code/branches/10.1/java/engine/org/apache/derby/iapi/types/SQLDouble.java Thu May 18 04:05:06 2006 @@ -134,7 +134,7 @@ */ public float getFloat() throws StandardException { - if (Math.abs(value) > Float.MAX_VALUE) + if (Float.isInfinite((float)value)) throw StandardException.newException(SQLState.LANG_OUTSIDE_RANGE_FOR_DATATYPE, TypeId.REAL_NAME); return (float) value; }