svn commit: r484697 - in /incubator/tuscany/java/das/rdb/src: main/java/org/apache/tuscany/das/rdb/exception/ main/java/org/apache/tuscany/das/rdb/impl/ test/java/org/apache/tuscany/das/rdb/test/

[bdaniel]

Author: bdaniel
Date: Fri Dec  8 10:47:28 2006
New Revision: 484697

URL: http://svn.apache.org/viewvc?view=rev&rev=484697
Log:
Add an OptimisticConcurrencyException class for OCC errors

Added:
    
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/exception/OptimisticConcurrencyException.java
Modified:
    
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java
    
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java

Added: 
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/exception/OptimisticConcurrencyException.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/exception/OptimisticConcurrencyException.java?view=auto&rev=484697
==============================================================================
--- 
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/exception/OptimisticConcurrencyException.java
 (added)
+++ 
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/exception/OptimisticConcurrencyException.java
 Fri Dec  8 10:47:28 2006
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.das.rdb.exception;
+
+
+public class OptimisticConcurrencyException extends RuntimeException {
+
+    private static final long serialVersionUID = -8430445422807942933L;
+
+    public OptimisticConcurrencyException(String string) {
+        super(string);
+    }
+
+   
+}

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=484697&r1=484696&r2=484697
==============================================================================
--- 
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
 Fri Dec  8 10:47:28 2006
@@ -21,6 +21,7 @@
 import java.sql.SQLException;
 
 import org.apache.tuscany.das.rdb.config.Update;
+import org.apache.tuscany.das.rdb.exception.OptimisticConcurrencyException;
 
 public class OptimisticWriteCommandImpl extends UpdateCommandImpl {
 
@@ -40,7 +41,7 @@
             int rowsAffected = statement.executeUpdate(parameters);
             success = true;
             if (rowsAffected == 0) {
-                throw new RuntimeException("An update collision occurred");
+                throw new OptimisticConcurrencyException("An update collision 
occurred");
             }
         } catch (SQLException e) {
             throw new RuntimeException(e);

Modified: 
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java?view=diff&rev=484697&r1=484696&r2=484697
==============================================================================
--- 
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java
 (original)
+++ 
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java
 Fri Dec  8 10:47:28 2006
@@ -25,6 +25,7 @@
 import org.apache.tuscany.das.rdb.DAS;
 import org.apache.tuscany.das.rdb.config.Config;
 import org.apache.tuscany.das.rdb.config.ConfigFactory;
+import org.apache.tuscany.das.rdb.exception.OptimisticConcurrencyException;
 import org.apache.tuscany.das.rdb.test.data.BookData;
 import org.apache.tuscany.das.rdb.test.data.CustomerData;
 import org.apache.tuscany.das.rdb.test.framework.DasTest;
@@ -58,7 +59,7 @@
         try {
             das.applyChanges(root);
             fail("An OCCException should be thrown");
-        } catch (RuntimeException ex) {
+        } catch (OptimisticConcurrencyException ex) {
             if (!ex.getMessage().equals("An update collision occurred")) {
                 throw ex;
             }
@@ -85,7 +86,7 @@
         try {
             das.applyChanges(root);
             fail("An OCCException should be thrown");
-        } catch (RuntimeException ex) {
+        } catch (OptimisticConcurrencyException ex) {
             if (!ex.getMessage().equals("An update collision occurred")) {
                 throw ex;
             }
@@ -129,7 +130,7 @@
         try {
             das.applyChanges(root);
             fail("An OCCException should be thrown");
-        } catch (RuntimeException ex) {
+        } catch (OptimisticConcurrencyException ex) {
             if (!ex.getMessage().equals("An update collision occurred")) {
                 throw ex;
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]