Commit 1ca4e700 authored by Barry Lind's avatar Barry Lind

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
parent d7c609f7
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Copyright (c) 2003, PostgreSQL Global Development Group * Copyright (c) 2003, PostgreSQL Global Development Group
* *
* IDENTIFICATION * 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 ...@@ -192,7 +192,7 @@ public class QueryExecutor
// did we get an error during this query? // did we get an error during this query?
if ( errorMessage != null ) 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 //if an existing result set was passed in reuse it, else
...@@ -283,7 +283,7 @@ public class QueryExecutor ...@@ -283,7 +283,7 @@ public class QueryExecutor
// did we get an error during this query? // did we get an error during this query?
if ( errorMessage != null ) 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 //if an existing result set was passed in reuse it, else
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Copyright (c) 2003, PostgreSQL Global Development Group * Copyright (c) 2003, PostgreSQL Global Development Group
* *
* IDENTIFICATION * 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 ...@@ -127,12 +127,4 @@ public class PSQLException extends SQLException
{ {
return message; return message;
} }
/*
* Overides Object
*/
public String toString()
{
return message != null ? message : "";
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment