Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 14529 invoked from network); 3 Apr 2008 05:53:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Apr 2008 05:53:01 -0000 Received: (qmail 90654 invoked by uid 500); 3 Apr 2008 05:53:01 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 90644 invoked by uid 500); 3 Apr 2008 05:53:01 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 90629 invoked by uid 99); 3 Apr 2008 05:53:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Apr 2008 22:53:01 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Apr 2008 05:52:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 10B231A9832; Wed, 2 Apr 2008 22:52:40 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r644177 - in /openjpa: branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java Date: Thu, 03 Apr 2008 05:52:39 -0000 To: commits@openjpa.apache.org From: fancy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080403055240.10B231A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fancy Date: Wed Apr 2 22:52:38 2008 New Revision: 644177 URL: http://svn.apache.org/viewvc?rev=644177&view=rev Log: OPENJPA-555 MappingTool got NullPointerException in DB2Dictionary.isDB2ZOSV8xOrLater() Modified: openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java Modified: openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java?rev=644177&r1=644176&r2=644177&view=diff ============================================================================== --- openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java (original) +++ openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java Wed Apr 2 22:52:38 2008 @@ -359,7 +359,8 @@ public boolean isDB2UDBV82OrLater() { boolean match = false; - if ((databaseProductVersion.indexOf("SQL") != -1 + if (databaseProductName != null && + (databaseProductVersion.indexOf("SQL") != -1 || databaseProductName.indexOf("DB2/") != -1) && ((maj == 8 && min >= 2) || (maj >= 9))) match = true; @@ -368,7 +369,8 @@ public boolean isDB2ZOSV8xOrLater() { boolean match = false; - if ((databaseProductVersion.indexOf("DSN") != -1 + if (databaseProductName != null && + (databaseProductVersion.indexOf("DSN") != -1 || databaseProductName.indexOf("DB2/") == -1) && maj >= 8) match = true; @@ -377,7 +379,8 @@ public boolean isDB2ISeriesV5R3OrEarlier() { boolean match = false; - if (databaseProductName.indexOf("AS") != -1 + if (databaseProductName != null && + databaseProductName.indexOf("AS") != -1 && ((maj == 5 && min <=3) || maj < 5)) match = true; return match; @@ -385,7 +388,8 @@ public boolean isDB2ISeriesV5R4OrLater() { boolean match = false; - if (databaseProductName.indexOf("AS") != -1 + if (databaseProductName != null && + databaseProductName.indexOf("AS") != -1 && (maj >=6 || (maj == 5 && min >=4))) match = true; return match; @@ -393,9 +397,10 @@ public boolean isDB2UDBV81OrEarlier() { boolean match = false; - if ((databaseProductVersion.indexOf("SQL") != -1 - || databaseProductName.indexOf("DB2/") != -1) && - ((maj == 8 && min <= 1) || maj < 8)) + if (databaseProductName != null && + (databaseProductVersion.indexOf("SQL") != -1 + || databaseProductName.indexOf("DB2/") != -1) && + ((maj == 8 && min <= 1) || maj < 8)) match = true; return match; } Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java?rev=644177&r1=644176&r2=644177&view=diff ============================================================================== --- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java (original) +++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java Wed Apr 2 22:52:38 2008 @@ -390,7 +390,8 @@ public boolean isDB2UDBV82OrLater() { boolean match = false; - if ((databaseProductVersion.indexOf("SQL") != -1 + if (databaseProductName != null && + (databaseProductVersion.indexOf("SQL") != -1 || databaseProductName.indexOf("DB2/") != -1) && ((maj == 8 && min >= 2) || (maj >= 9))) match = true; @@ -399,7 +400,8 @@ public boolean isDB2ZOSV8xOrLater() { boolean match = false; - if ((databaseProductVersion.indexOf("DSN") != -1 + if (databaseProductName != null && + (databaseProductVersion.indexOf("DSN") != -1 || databaseProductName.indexOf("DB2/") == -1) && maj >= 8) match = true; @@ -408,7 +410,8 @@ public boolean isDB2ISeriesV5R3OrEarlier() { boolean match = false; - if (databaseProductName.indexOf("AS") != -1 + if (databaseProductName != null && + databaseProductName.indexOf("AS") != -1 && ((maj == 5 && min <=3) || maj < 5)) match = true; return match; @@ -416,7 +419,8 @@ public boolean isDB2ISeriesV5R4OrLater() { boolean match = false; - if (databaseProductName.indexOf("AS") != -1 + if (databaseProductName != null && + databaseProductName.indexOf("AS") != -1 && (maj >=6 || (maj == 5 && min >=4))) match = true; return match; @@ -424,9 +428,10 @@ public boolean isDB2UDBV81OrEarlier() { boolean match = false; - if ((databaseProductVersion.indexOf("SQL") != -1 - || databaseProductName.indexOf("DB2/") != -1) && - ((maj == 8 && min <= 1) || maj < 8)) + if (databaseProductName != null && + (databaseProductVersion.indexOf("SQL") != -1 + || databaseProductName.indexOf("DB2/") != -1) && + ((maj == 8 && min <= 1) || maj < 8)) match = true; return match; }