From: Barry Lind <barry@xythos.com>
Date: Mon, 11 Aug 2003 21:18:47 +0000 (+0000)
Subject: Applied patch by Oliver Jowett to clean up some exception handling
X-Git-Tag: REL7_4_BETA2~100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ca4e700deaf8ce9a1b4c07c97bec4f58c4611b1;p=postgresql

Applied patch by Oliver Jowett to clean up some exception handling

 Modified Files:
 	jdbc/org/postgresql/core/QueryExecutor.java
 	jdbc/org/postgresql/util/PSQLException.java
---

diff --git a/src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java b/src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
index 5b030e75e6..122497676d 100644
--- a/src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
+++ b/src/interfaces/jdbc/org/postgresql/core/QueryExecutor.java
@@ -6,7 +6,7 @@
  * Copyright (c) 2003, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/core/Attic/QueryExecutor.java,v 1.22 2003/05/29 03:21:32 barry Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/core/Attic/QueryExecutor.java,v 1.23 2003/08/11 21:18:47 barry Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -192,7 +192,7 @@ public class QueryExecutor
 
 			// did we get an error during this query?
 			if ( errorMessage != null )
-				throw new SQLException( errorMessage.toString() );
+				throw new SQLException( errorMessage.toString().trim() );
 
 
 			//if an existing result set was passed in reuse it, else
@@ -283,7 +283,7 @@ public class QueryExecutor
 
 			// did we get an error during this query?
 			if ( errorMessage != null )
-				throw new SQLException( errorMessage.toString() );
+				throw new SQLException( errorMessage.toString().trim() );
 
 
 			//if an existing result set was passed in reuse it, else
diff --git a/src/interfaces/jdbc/org/postgresql/util/PSQLException.java b/src/interfaces/jdbc/org/postgresql/util/PSQLException.java
index f043fded08..84ccc60ca2 100644
--- a/src/interfaces/jdbc/org/postgresql/util/PSQLException.java
+++ b/src/interfaces/jdbc/org/postgresql/util/PSQLException.java
@@ -7,7 +7,7 @@
  * Copyright (c) 2003, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/util/Attic/PSQLException.java,v 1.11 2003/03/14 01:21:47 barry Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/util/Attic/PSQLException.java,v 1.12 2003/08/11 21:18:47 barry Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -127,12 +127,4 @@ public class PSQLException extends SQLException
 	{
 		return message;
 	}
-
-	/*
-	 * Overides Object
-	 */
-	public String toString()
-	{
-		return message != null ? message : "";
-	}
 }