You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by kw...@apache.org on 2007/02/02 07:46:01 UTC
svn commit: r502521 - in /incubator/tuscany/java/das/rdb/src:
main/java/org/apache/tuscany/das/rdb/impl/
test/java/org/apache/tuscany/das/rdb/test/suites/
Author: kwilliams
Date: Thu Feb 1 22:46:01 2007
New Revision: 502521
URL: http://svn.apache.org/viewvc?view=rev&rev=502521
Log:
Fix for TUSCANY-1087 : DAS should not commit individual commands as part of applyChanges
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java?view=diff&rev=502521&r1=502520&r2=502521
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java Thu Feb 1 22:46:01 2007
@@ -70,7 +70,7 @@
parm.setValue(dObject.get(parm.getName()));
}
- writeCommand.execute();
+ writeCommand.basicExecute();
if (isInsert && (propagatedID != null)) {
if (this.logger.isDebugEnabled()) {
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java?view=diff&rev=502521&r1=502520&r2=502521
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java Thu Feb 1 22:46:01 2007
@@ -34,24 +34,15 @@
addParameters(update.getParameters());
}
- public void execute() {
-
- boolean success = false;
+ public void basicExecute() {
try {
int rowsAffected = statement.executeUpdate(parameters);
- success = true;
if (rowsAffected == 0) {
throw new OptimisticConcurrencyException("An update collision occurred");
}
} catch (SQLException e) {
throw new RuntimeException(e);
- } finally {
- if (success) {
- statement.getConnection().cleanUp();
- } else {
- statement.getConnection().errorCleanUp();
- }
}
-
}
+
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java?view=diff&rev=502521&r1=502520&r2=502521
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java Thu Feb 1 22:46:01 2007
@@ -27,7 +27,6 @@
public abstract class WriteCommandImpl extends CommandImpl {
-
public WriteCommandImpl(String sqlString) {
super(sqlString);
}
@@ -36,10 +35,8 @@
boolean success = false;
try {
- statement.executeUpdate(parameters);
+ basicExecute();
success = true;
- } catch (SQLException e) {
- throw new RuntimeException(e);
} finally {
if (success) {
statement.getConnection().cleanUp();
@@ -50,6 +47,14 @@
}
+ public void basicExecute() {
+ try {
+ statement.executeUpdate(parameters);
+ } catch (SQLException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
public DataObject executeQuery() {
throw new UnsupportedOperationException();
}
@@ -79,7 +84,5 @@
addParameter(p);
}
}
-
-
}
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java?view=diff&rev=502521&r1=502520&r2=502521
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java Thu Feb 1 22:46:01 2007
@@ -103,7 +103,7 @@
suite.addTest(new TestSuite(KennelTests.class));
-// suite.addTest(new TestSuite(TransactionTests.class));
+ suite.addTest(new TestSuite(TransactionTests.class));
//$JUnit-END$
return suite;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org