From jdo-commits-return-2263-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org Mon Jan 21 22:02:26 2008
Return-Path: <jdo-commits-return-2263-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org>
Delivered-To: apmail-db-jdo-commits-archive@www.apache.org
Received: (qmail 28475 invoked from network); 21 Jan 2008 22:02:26 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 21 Jan 2008 22:02:26 -0000
Received: (qmail 13160 invoked by uid 500); 21 Jan 2008 22:02:16 -0000
Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jdo-commits-help@db.apache.org>
List-Unsubscribe: <mailto:jdo-commits-unsubscribe@db.apache.org>
List-Post: <mailto:jdo-commits@db.apache.org>
List-Id: <jdo-commits.db.apache.org>
Reply-To: jdo-dev@db.apache.org
Delivered-To: mailing list jdo-commits@db.apache.org
Received: (qmail 13149 invoked by uid 99); 21 Jan 2008 22:02:16 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Jan 2008 14:02:16 -0800
X-ASF-Spam-Status: No, hits=-100.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; Mon, 21 Jan 2008 22:02:10 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 24C261A9838; Mon, 21 Jan 2008 14:02:03 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r614028 -
 /db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/QueryTest.java
Date: Mon, 21 Jan 2008 22:02:02 -0000
To: jdo-commits@db.apache.org
From: clr@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080121220203.24C261A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: clr
Date: Mon Jan 21 14:02:01 2008
New Revision: 614028

URL: http://svn.apache.org/viewvc?rev=614028&view=rev
Log:
JDO-570 Improve error handling; add query string to unexpected exception

Modified:
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/QueryTest.java

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/QueryTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/QueryTest.java?rev=614028&r1=614027&r2=614028&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/QueryTest.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/QueryTest.java Mon Jan 21 14:02:01 2008
@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.jdo.JDOException;
 import javax.jdo.JDOUserException;
 import javax.jdo.PersistenceManager;
 import javax.jdo.Query;
@@ -1303,8 +1304,14 @@
             }
         } catch (JDOUserException e) {
             if (positive) {
-                throw e;
-            }
+                String msg = "JDOUserException thrown while executing query:\n" +
+                        singleStringQuery;
+                throw new JDOException(msg, e);
+            }
+        } catch (JDOException e) {
+            String msg = "JDOException thrown while executing query:\n" +
+                    singleStringQuery;
+            throw new JDOException(msg, e);
         } finally {
             if (tx.isActive()) {
                 tx.rollback();
@@ -1454,8 +1461,14 @@
             tx.commit();
         } catch (JDOUserException e) {
             if (positive) {
-                throw e;
-            }
+                String msg = "JDOUserException thrown while executing query:\n" +
+                        singleStringQuery;
+                throw new JDOException(msg, e);
+            }
+        } catch (JDOException e) {
+            String msg = "JDOException thrown while executing query:\n" +
+                    singleStringQuery;
+            throw new JDOException(msg, e);
         } finally {
             if (tx.isActive()) {
                 tx.rollback();