archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8235961: SyncResolverImpl does not throw SQLException as expected

Browse source 
Reviewed-by: joehw, bpb
This commit is contained in:
Lance Andersen 2019-12-23 17:18:32 -05:00
parent 417672bc9d
commit da03b15fac
3 changed files with 92 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/java.sql.rowset/share/classes/com/sun/rowset/CachedRowSetImpl.java
View file

@ -1601,7 +1601,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern
* @throws SQLException if the given index is out of bounds
*/
private void checkIndex(int idx) throws SQLException {
if (idx < 1 || idx > RowSetMD.getColumnCount()) {
if (idx < 1 || RowSetMD == null || idx > RowSetMD.getColumnCount()) {
throw new SQLException(resBundle.handleGetObject("cachedrowsetimpl.invalidcol").toString());
}
}
@ -1638,14 +1638,15 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern
private int getColIdxByName(String name) throws SQLException {
RowSetMD = (RowSetMetaDataImpl)this.getMetaData();
int cols = RowSetMD.getColumnCount();
for (int i=1; i <= cols; ++i) {
String colName = RowSetMD.getColumnName(i);
if (colName != null)
if (name.equalsIgnoreCase(colName))
return (i);
else
continue;
if (RowSetMD != null) {
for (int i = 1; i <= cols; ++i) {
String colName = RowSetMD.getColumnName(i);
if (colName != null)
if (name.equalsIgnoreCase(colName))
return (i);
else
continue;
}
}
throw new SQLException(resBundle.handleGetObject("cachedrowsetimpl.invalcolnm").toString());

18
src/java.sql.rowset/share/classes/com/sun/rowset/internal/SyncResolverImpl.java
View file

@ -123,7 +123,7 @@ public class SyncResolverImpl extends CachedRowSetImpl implements SyncResolver {
/**
* Retrieves the conflict status of the current row of this
* {@code SyncResolver}, which indicates the operationthe {@code RowSet}
* {@code SyncResolver}, which indicates the operation the {@code RowSet}
* object was attempting when the conflict occurred.
*
* @return one of the following constants:
@ -132,7 +132,8 @@ public class SyncResolverImpl extends CachedRowSetImpl implements SyncResolver {
* {@code SyncResolver.INSERT_ROW_CONFLICT}
*/
public int getStatus() {
return ((Integer)stats.get(rowStatus-1)).intValue();
return stats != null ? (Integer) stats.get(rowStatus - 1) :
SyncResolver.NO_ROW_CONFLICT;
}
/**
@ -148,6 +149,8 @@ public class SyncResolverImpl extends CachedRowSetImpl implements SyncResolver {
return crsRes.getObject(index);
} catch(SQLException sqle) {
throw new SQLException(sqle.getMessage());
} catch (Exception e ) {
throw new SQLException("Problem obtaining conflicted value!", e);
}
}
@ -164,6 +167,8 @@ public class SyncResolverImpl extends CachedRowSetImpl implements SyncResolver {
return crsRes.getObject(columnName);
} catch(SQLException sqle) {
throw new SQLException(sqle.getMessage());
} catch (Exception e ) {
throw new SQLException("Problem obtaining conflicted value!", e);
}
}
@ -189,8 +194,9 @@ public class SyncResolverImpl extends CachedRowSetImpl implements SyncResolver {
* then sync back immediately.
**/
try {
ResultSetMetaData rsmd = crsSync.getMetaData();
// check whether the index is in range
if(index<=0 || index > crsSync.getMetaData().getColumnCount() ) {
if(index<=0 || rsmd == null || index > rsmd.getColumnCount() ) {
throw new SQLException(resBundle.handleGetObject("syncrsimpl.indexval").toString()+ index);
}
// check whether index col is in conflict
@ -393,8 +399,8 @@ public class SyncResolverImpl extends CachedRowSetImpl implements SyncResolver {
* @param obj an {@code Object} that is the value to be set in the data source
*/
public void setResolvedValue(String columnName, Object obj) throws SQLException {
// modify method to throw SQLException in spec
// %%% Missing implementation!
// %%% Missing implementation!
throw new SQLException("Method not supported");
}
/**
@ -503,7 +509,7 @@ public class SyncResolverImpl extends CachedRowSetImpl implements SyncResolver {
* is TYPE_FORWARD_ONLY
*/
public boolean previousConflict() throws SQLException {
throw new UnsupportedOperationException();
return false;
}
//-----------------------------------------------------------------------