diff options
| author | Don Anderson <dda@ddanderson.com> | 2014-10-23 10:33:19 -0400 |
|---|---|---|
| committer | Don Anderson <dda@ddanderson.com> | 2014-10-23 10:33:19 -0400 |
| commit | b7c182b26ca907508194a60681d8350fef82555e (patch) | |
| tree | 15a93dbf31c58542b7b7ca8b0309365760445160 /lang | |
| parent | f2dd007edadbf5484a83b3ebe219b991f1c28895 (diff) | |
| download | mongo-b7c182b26ca907508194a60681d8350fef82555e.tar.gz | |
Renamed WiredTigerDeadlockException to be WiredTigerRollbackException.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/java/Makefile.am | 2 | ||||
| -rw-r--r-- | lang/java/src/com/wiredtiger/db/WiredTigerRollbackException.java (renamed from lang/java/src/com/wiredtiger/db/WiredTigerDeadlockException.java) | 4 | ||||
| -rw-r--r-- | lang/java/wiredtiger.i | 2 |
3 files changed, 4 insertions, 4 deletions
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/WiredTigerRollbackException.java index c1ca151f0ab..0521b43aac9 100644 --- a/lang/java/src/com/wiredtiger/db/WiredTigerDeadlockException.java +++ b/lang/java/src/com/wiredtiger/db/WiredTigerRollbackException.java @@ -30,11 +30,11 @@ 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 { +public class WiredTigerRollbackException extends WiredTigerException { /** * Constructor. */ - public WiredTigerDeadlockException(String msg) { + 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) |