Commit1ca4e70

Barry Lind

committed

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

1 parentd7c609f commit1ca4e70Copy full SHA for 1ca4e70

File tree

-12

lines changed

src/interfaces/jdbc/org/postgresql
- core
  - QueryExecutor.java
- util
  - PSQLException.java

-12

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Copyright (c) 2003, PostgreSQL Global Development Group`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/core/Attic/QueryExecutor.java,v 1.22 2003/05/29 03:21:32 barry Exp $`
	`9`	`+ * $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/core/Attic/QueryExecutor.java,v 1.23 2003/08/1121:18:47 barry Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -192,7 +192,7 @@ private BaseResultSet executeV3() throws SQLException`
`192`	`192`
`193`	`193`	`// did we get an error during this query?`
`194`	`194`	`if (errorMessage !=null )`
`195`		`-thrownewSQLException(errorMessage.toString() );`
	`195`	`+thrownewSQLException(errorMessage.toString().trim() );`
`196`	`196`
`197`	`197`
`198`	`198`	`//if an existing result set was passed in reuse it, else`
`@@ -283,7 +283,7 @@ private BaseResultSet executeV2() throws SQLException`
`283`	`283`
`284`	`284`	`// did we get an error during this query?`
`285`	`285`	`if (errorMessage !=null )`
`286`		`-thrownewSQLException(errorMessage.toString() );`
	`286`	`+thrownewSQLException(errorMessage.toString().trim() );`
`287`	`287`
`288`	`288`
`289`	`289`	`//if an existing result set was passed in reuse it, else`

Lines changed: 1 addition & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Copyright (c) 2003, PostgreSQL Global Development Group`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/util/Attic/PSQLException.java,v 1.11 2003/03/14 01:21:47 barry Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/util/Attic/PSQLException.java,v 1.12 2003/08/11 21:18:47 barry Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -127,12 +127,4 @@ public String getMessage()`
`127`	`127`	`{`
`128`	`128`	`returnmessage;`
`129`	`129`	`}`
`130`		`-`
`131`		`-/*`
`132`		`- * Overides Object`
`133`		`- */`
`134`		`-publicStringtoString()`
`135`		`-{`
`136`		`-returnmessage !=null ?message :"";`
`137`		`-}`
`138`	`130`	`}`

Comments

(0)