NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit54cc549

Dave Cramer

committed

modifications to the way the protocol is handled to be consistent with

QueryExecutor. This includes:1) only exit after we receive a 'Z' packet2) append error messages to a buffer and throw the exception at the end

1 parent0092322 commit54cc549Copy full SHA for 54cc549

File tree

1 file changed

+16

-5

lines changed

src/interfaces/jdbc/org/postgresql/fastpath
- Fastpath.java

1 file changed

+16

-5

lines changed

`‎src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java`

Lines changed: 16 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,9 @@ public Object fastpath(int fnid, boolean resulttype, FastpathArg[] args) throws`
`98`	`98`
`99`	`99`	`// Now loop, reading the results`
`100`	`100`	`Objectresult =null;// our result`
`101`		`-while (true)`
	`101`	`+StringBuffererrorMessage =null;`
	`102`	`+booleanloop =true;`
	`103`	`+while (loop)`
`102`	`104`	`{`
`103`	`105`	`intin =stream.ReceiveChar();`
`104`	`106`	`//DriverManager.println("ReceiveChar() = "+in+" '"+((char)in)+"'");`
`@@ -128,8 +130,10 @@ public Object fastpath(int fnid, boolean resulttype, FastpathArg[] args) throws`
`128`	`130`	`//------------------------------`
`129`	`131`	`// Error message returned`
`130`	`132`	`case'E':`
`131`		`-thrownewPSQLException("postgresql.fp.error",stream.ReceiveString(conn.getEncoding()));`
`132`		`-`
	`133`	`+if (errorMessage ==null )`
	`134`	`+errorMessage =newStringBuffer();`
	`135`	`+errorMessage.append(stream.ReceiveString(conn.getEncoding()));`
	`136`	`+break;`
`133`	`137`	`//------------------------------`
`134`	`138`	`// Notice from backend`
`135`	`139`	`case'N':`
`@@ -143,15 +147,22 @@ public Object fastpath(int fnid, boolean resulttype, FastpathArg[] args) throws`
`143`	`147`	`// processed earlier. If no result, this already contains null`
`144`	`148`	`case'0':`
`145`	`149`	`//DriverManager.println("returning "+result);`
`146`		`-returnresult;`
`147`		`-`
	`150`	`+//return result;`
	`151`	`+break;`
`148`	`152`	`case'Z':`
	`153`	`+// cause the loop to exit`
	`154`	`+loop =false;`
`149`	`155`	`break;`
`150`	`156`
`151`	`157`	`default:`
`152`	`158`	`thrownewPSQLException("postgresql.fp.protocol",newCharacter((char)in));`
`153`	`159`	`}`
`154`	`160`	`}`
	`161`	`+`
	`162`	`+if (errorMessage !=null )`
	`163`	`+thrownewPSQLException("postgresql.fp.error",errorMessage.toString());`
	`164`	`+`
	`165`	`+returnresult;`
`155`	`166`	`}`
`156`	`167`	`}`
`157`	`168`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit54cc549

File tree

1 file changed

1 file changed

`‎src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java`

0 commit comments