• R/O
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revision2582 (tree)
Time2023-07-14 19:47:10
Authort_nakayama1971

Log Message

(empty log message)

Change Summary

Incremental Difference

--- trunk/s2/dbcp/src/main/java/org/seasar/extension/dbcp/impl/ConnectionWrapperImpl.java (revision 2581)
+++ trunk/s2/dbcp/src/main/java/org/seasar/extension/dbcp/impl/ConnectionWrapperImpl.java (revision 2582)
@@ -68,7 +68,7 @@
6868 /** Connection */
6969 private Connection physicalConnection;
7070 /** クローズ判断 */
71- private boolean closed = false;
71+ private boolean closed;
7272 /** Transaction */
7373 private Transaction transaction;
7474
@@ -79,18 +79,34 @@
7979 * @param conn 物理コネクション
8080 * @param pool コネクションプール
8181 * @param tx トランザクション
82- * @throws SQLException SQL例外が発生した場合
8382 */
8483 public ConnectionWrapperImpl(final XAConnection xac, final Connection conn,
85- final ConnectionPool pool, final Transaction tx) throws SQLException {
84+ final ConnectionPool pool, final Transaction tx) {
8685 this.xaConnection = xac;
8786 this.physicalConnection = conn;
88- this.xaResource = new XAResourceWrapperImpl(xac.getXAResource(), this);
87+ this.xaResource = createXAResource(xac, this);
8988 this.connectionPool = pool;
9089 this.transaction = tx;
9190 }
9291
9392 /**
93+ * XAResource作成
94+ *
95+ * @param xac XAコネクション
96+ * @param wrapper ConnectionWrapper
97+ * @return XAResource
98+ */
99+ private static XAResource createXAResource(
100+ final XAConnection xac, final ConnectionWrapper wrapper) {
101+ try {
102+ return new XAResourceWrapperImpl(xac.getXAResource(), wrapper);
103+ } catch (final SQLException e) {
104+ LOGGER.error(e.getMessage(), e);
105+ return null;
106+ }
107+ }
108+
109+ /**
94110 * @see org.seasar.extension.dbcp.ConnectionWrapper#getPhysicalConnection()
95111 */
96112 @Override