* [1921799] - disable reaonly optimization
* Added autocommit checking, failure to set autocommit on connection is very dangerous.
This commit is contained in:
parent
593a37a464
commit
be285084f9
|
|
@ -419,6 +419,15 @@ public final class DB
|
||||||
}
|
}
|
||||||
**/
|
**/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//hengsin: failed to set autocommit can lead to severe lock up of the system
|
||||||
|
try {
|
||||||
|
if (conn != null && conn.getAutoCommit() != autoCommit)
|
||||||
|
{
|
||||||
|
throw new IllegalStateException("Failed to set the requested auto commit mode on connection. [autoCommit=" + autoCommit +"]");
|
||||||
|
}
|
||||||
|
} catch (SQLException e) {}
|
||||||
|
|
||||||
return conn;
|
return conn;
|
||||||
} // createConnection
|
} // createConnection
|
||||||
|
|
||||||
|
|
@ -438,6 +447,8 @@ public final class DB
|
||||||
|
|
||||||
Connection conn = s_cc.getConnection (autoCommit, trxLevel);
|
Connection conn = s_cc.getConnection (autoCommit, trxLevel);
|
||||||
|
|
||||||
|
//hengsin: this could be problematic as it can be reuse for readwrite activites after return to pool
|
||||||
|
/*
|
||||||
if (conn != null)
|
if (conn != null)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
|
@ -449,12 +460,20 @@ public final class DB
|
||||||
conn = null;
|
conn = null;
|
||||||
log.log(Level.SEVERE, ex.getMessage(), ex);
|
log.log(Level.SEVERE, ex.getMessage(), ex);
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
|
|
||||||
if (conn == null)
|
if (conn == null)
|
||||||
{
|
{
|
||||||
throw new IllegalStateException("DB.getConnectionRO - @NoDBConnection@");
|
throw new IllegalStateException("DB.getConnectionRO - @NoDBConnection@");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//hengsin: failed to set autocommit can lead to severe lock up of the system
|
||||||
|
try {
|
||||||
|
if (conn.getAutoCommit() != autoCommit)
|
||||||
|
{
|
||||||
|
throw new IllegalStateException("Failed to set the requested auto commit mode on connection. [autocommit=" + autoCommit +"]");
|
||||||
|
}
|
||||||
|
} catch (SQLException e) {}
|
||||||
|
|
||||||
return conn;
|
return conn;
|
||||||
} // createConnection
|
} // createConnection
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue