Commit7934c93

committed

This patch fixes a bug which occurs when setObject(1,obj) is called and obj

is of type Object, and is nullDave Cramer

1 parent37b006e commit7934c93Copy full SHA for 7934c93

File tree

+16

-0

lines changed

src/interfaces/jdbc/org/postgresql
- jdbc1
  - PreparedStatement.java
- jdbc2
  - PreparedStatement.java

+16

-0

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -455,6 +455,10 @@ public void clearParameters() throws SQLException`
`455`	`455`	`*/`
`456`	`456`	`publicvoidsetObject(intparameterIndex,Objectx,inttargetSqlType,intscale)throwsSQLException`
`457`	`457`	`{`
	`458`	`+if (x ==null){`
	`459`	`+setNull(parameterIndex,Types.OTHER);`
	`460`	`+return;`
	`461`	`+}`
`458`	`462`	`switch (targetSqlType)`
`459`	`463`	`{`
`460`	`464`	`caseTypes.TINYINT:`
`@@ -506,6 +510,10 @@ public void setObject(int parameterIndex, Object x, int targetSqlType) throws SQ`
`506`	`510`	`*/`
`507`	`511`	`publicvoidsetObject(intparameterIndex,Objectx)throwsSQLException`
`508`	`512`	`{`
	`513`	`+if (x ==null){`
	`514`	`+setNull(parameterIndex,Types.OTHER);`
	`515`	`+return;`
	`516`	`+}`
`509`	`517`	`if (xinstanceofString)`
`510`	`518`	`setString(parameterIndex, (String)x);`
`511`	`519`	`elseif (xinstanceofBigDecimal)`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -515,6 +515,10 @@ public void clearParameters() throws SQLException`
`515`	`515`	`*/`
`516`	`516`	`publicvoidsetObject(intparameterIndex,Objectx,inttargetSqlType,intscale)throwsSQLException`
`517`	`517`	`{`
	`518`	`+if (x ==null){`
	`519`	`+setNull(parameterIndex,Types.OTHER);`
	`520`	`+return;`
	`521`	`+}`
`518`	`522`	`switch (targetSqlType)`
`519`	`523`	`{`
`520`	`524`	`caseTypes.TINYINT:`
`@@ -566,6 +570,10 @@ public void setObject(int parameterIndex, Object x, int targetSqlType) throws SQ`
`566`	`570`	`*/`
`567`	`571`	`publicvoidsetObject(intparameterIndex,Objectx)throwsSQLException`
`568`	`572`	`{`
	`573`	`+if (x ==null){`
	`574`	`+setNull(parameterIndex,Types.OTHER);`
	`575`	`+return;`
	`576`	`+}`
`569`	`577`	`if (xinstanceofString)`
`570`	`578`	`setString(parameterIndex, (String)x);`
`571`	`579`	`elseif (xinstanceofBigDecimal)`

Comments

(0)