Merge pull request #4050 from cockroachdb/backport-java-fix

Jesse Seldess · web-flow · commit 01554fa2b7c3 · 2018-11-15T12:32:54.000-05:00
Backport Java code sample fix to 2.0
diff --git a/_includes/v2.0/app/TxnSample.java b/_includes/v2.0/app/TxnSample.java
@@ -75,6 +75,7 @@ public static void retryTransaction(Connection conn, RetryableTransaction tx)
                 tx.run(conn);
                 releaseAttempted = true;
                 conn.releaseSavepoint(sp);
+				break;
             }
             catch(SQLException e) {
                 String sqlState = e.getSQLState();
@@ -83,14 +84,12 @@ public static void retryTransaction(Connection conn, RetryableTransaction tx)
                 if(sqlState.equals("40001")) {
                     // Signal the database that we will attempt a retry.
                     conn.rollback(sp);
-                    continue;
                 } else if(releaseAttempted) {
                     throw new AmbiguousCommitException(e);
                 } else {
                     throw e;
                 }
             }
-            break;
         }
         conn.commit();
     }

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ public static void retryTransaction(Connection conn, RetryableTransaction tx)`
`75`	`75`	`tx.run(conn);`
`76`	`76`	`releaseAttempted = true;`
`77`	`77`	`conn.releaseSavepoint(sp);`
	`78`	`+ break;`
`78`	`79`	`}`
`79`	`80`	`catch(SQLException e) {`
`80`	`81`	`String sqlState = e.getSQLState();`
`@@ -83,14 +84,12 @@ public static void retryTransaction(Connection conn, RetryableTransaction tx)`
`83`	`84`	`if(sqlState.equals("40001")) {`
`84`	`85`	`// Signal the database that we will attempt a retry.`
`85`	`86`	`conn.rollback(sp);`
`86`		`- continue;`
`87`	`87`	`} else if(releaseAttempted) {`
`88`	`88`	`throw new AmbiguousCommitException(e);`
`89`	`89`	`} else {`
`90`	`90`	`throw e;`
`91`	`91`	`}`
`92`	`92`	`}`
`93`		`- break;`
`94`	`93`	`}`
`95`	`94`	`conn.commit();`
`96`	`95`	`}`