From b7c182b26ca907508194a60681d8350fef82555e Mon Sep 17 00:00:00 2001 From: Don Anderson Date: Thu, 23 Oct 2014 10:33:19 -0400 Subject: Renamed WiredTigerDeadlockException to be WiredTigerRollbackException. --- lang/java/Makefile.am | 2 +- .../wiredtiger/db/WiredTigerDeadlockException.java | 41 ---------------------- .../wiredtiger/db/WiredTigerRollbackException.java | 41 ++++++++++++++++++++++ lang/java/wiredtiger.i | 2 +- 4 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 lang/java/src/com/wiredtiger/db/WiredTigerDeadlockException.java create mode 100644 lang/java/src/com/wiredtiger/db/WiredTigerRollbackException.java (limited to 'lang') diff --git a/lang/java/Makefile.am b/lang/java/Makefile.am index 39c7aa43803..58754c1fd56 100644 --- a/lang/java/Makefile.am +++ b/lang/java/Makefile.am @@ -24,7 +24,7 @@ JAVA_SRC = \ $(JAVADESTFULL)/PackOutputStream.java \ $(JAVADESTFULL)/PackUtil.java \ $(JAVADESTFULL)/Session.java \ - $(JAVADESTFULL)/WiredTigerDeadlockException.java \ + $(JAVADESTFULL)/WiredTigerRollbackException.java \ $(JAVADESTFULL)/WiredTigerException.java \ $(JAVADESTFULL)/WiredTigerPackingException.java \ $(JAVADESTFULL)/WiredTigerPanicException.java \ diff --git a/lang/java/src/com/wiredtiger/db/WiredTigerDeadlockException.java b/lang/java/src/com/wiredtiger/db/WiredTigerDeadlockException.java deleted file mode 100644 index c1ca151f0ab..00000000000 --- a/lang/java/src/com/wiredtiger/db/WiredTigerDeadlockException.java +++ /dev/null @@ -1,41 +0,0 @@ -/*- - * Public Domain 2008-2014 WiredTiger, Inc. - * - * This is free and unencumbered software released into the public domain. - * - * Anyone is free to copy, modify, publish, use, compile, sell, or - * distribute this software, either in source code form or as a compiled - * binary, for any purpose, commercial or non-commercial, and by any - * means. - * - * In jurisdictions that recognize copyright laws, the author or authors - * of this software dedicate any and all copyright interest in the - * software to the public domain. We make this dedication for the benefit - * of the public at large and to the detriment of our heirs and - * successors. We intend this dedication to be an overt act of - * relinquishment in perpetuity of all present and future rights to this - * software under copyright law. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ -package com.wiredtiger.db; - -/** - * An exception that is generated by the WiredTiger application - * when there is a conflict between concurrent operations. - */ -public class WiredTigerDeadlockException extends WiredTigerException { - /** - * Constructor. - */ - public WiredTigerDeadlockException(String msg) { - super(msg); - } -} - diff --git a/lang/java/src/com/wiredtiger/db/WiredTigerRollbackException.java b/lang/java/src/com/wiredtiger/db/WiredTigerRollbackException.java new file mode 100644 index 00000000000..0521b43aac9 --- /dev/null +++ b/lang/java/src/com/wiredtiger/db/WiredTigerRollbackException.java @@ -0,0 +1,41 @@ +/*- + * Public Domain 2008-2014 WiredTiger, Inc. + * + * This is free and unencumbered software released into the public domain. + * + * Anyone is free to copy, modify, publish, use, compile, sell, or + * distribute this software, either in source code form or as a compiled + * binary, for any purpose, commercial or non-commercial, and by any + * means. + * + * In jurisdictions that recognize copyright laws, the author or authors + * of this software dedicate any and all copyright interest in the + * software to the public domain. We make this dedication for the benefit + * of the public at large and to the detriment of our heirs and + * successors. We intend this dedication to be an overt act of + * relinquishment in perpetuity of all present and future rights to this + * software under copyright law. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ +package com.wiredtiger.db; + +/** + * An exception that is generated by the WiredTiger application + * when there is a conflict between concurrent operations. + */ +public class WiredTigerRollbackException extends WiredTigerException { + /** + * Constructor. + */ + public WiredTigerRollbackException(String msg) { + super(msg); + } +} + diff --git a/lang/java/wiredtiger.i b/lang/java/wiredtiger.i index 73dc276ef64..023fafde1d0 100644 --- a/lang/java/wiredtiger.i +++ b/lang/java/wiredtiger.i @@ -95,7 +95,7 @@ static void throwWiredTigerException(JNIEnv *jenv, int err) { if (err == WT_PANIC) clname = "com/wiredtiger/db/WiredTigerPanicException"; else if (err == WT_DEADLOCK) - clname = "com/wiredtiger/db/WiredTigerDeadlockException"; + clname = "com/wiredtiger/db/WiredTigerRollbackException"; else clname = "com/wiredtiger/db/WiredTigerException"; if (clname) -- cgit v1.2.1