From 3429d9986c678c2c89d3d98795d405d5058b1512 Mon Sep 17 00:00:00 2001
From: "Brian S. O'Neill" <bronee@gmail.com>
Date: Tue, 22 Dec 2009 18:07:24 +0000
Subject: Remove isClosed method, which broke compatibility.
---
src/main/java/com/amazon/carbonado/Repository.java | 4 +---
.../java/com/amazon/carbonado/repo/indexed/IndexedRepository.java | 2 ++
.../java/com/amazon/carbonado/repo/logging/LoggingRepository.java | 4 +++-
.../com/amazon/carbonado/repo/replicated/ReplicatedRepository.java | 2 ++
src/main/java/com/amazon/carbonado/spi/AbstractRepository.java | 1 -
5 files changed, 8 insertions(+), 5 deletions(-)
(limited to 'src')
diff --git a/src/main/java/com/amazon/carbonado/Repository.java b/src/main/java/com/amazon/carbonado/Repository.java
index 0d08f3d..d64a7b0 100644
--- a/src/main/java/com/amazon/carbonado/Repository.java
+++ b/src/main/java/com/amazon/carbonado/Repository.java
@@ -157,8 +157,6 @@ public interface Repository {
/**
* Returns true if repository was explicitly closed or shutdown.
- *
- * @since 1.2.2
*/
- boolean isClosed();
+ //boolean isClosed();
}
diff --git a/src/main/java/com/amazon/carbonado/repo/indexed/IndexedRepository.java b/src/main/java/com/amazon/carbonado/repo/indexed/IndexedRepository.java
index de6b8df..e540924 100644
--- a/src/main/java/com/amazon/carbonado/repo/indexed/IndexedRepository.java
+++ b/src/main/java/com/amazon/carbonado/repo/indexed/IndexedRepository.java
@@ -227,9 +227,11 @@ class IndexedRepository implements Repository,
mRepository.close();
}
+ /*
public boolean isClosed() {
return mRepository.isClosed();
}
+ */
public Repository getRootRepository() {
return mRootRef.get();
diff --git a/src/main/java/com/amazon/carbonado/repo/logging/LoggingRepository.java b/src/main/java/com/amazon/carbonado/repo/logging/LoggingRepository.java
index a3d1d4b..54aeab7 100644
--- a/src/main/java/com/amazon/carbonado/repo/logging/LoggingRepository.java
+++ b/src/main/java/com/amazon/carbonado/repo/logging/LoggingRepository.java
@@ -106,10 +106,12 @@ class LoggingRepository implements Repository, LogAccessCapability {
public void close() {
mRepo.close();
}
-
+
+ /*
public boolean isClosed() {
return mRepo.isClosed();
}
+ */
public Log getLog() {
return mLog;
diff --git a/src/main/java/com/amazon/carbonado/repo/replicated/ReplicatedRepository.java b/src/main/java/com/amazon/carbonado/repo/replicated/ReplicatedRepository.java
index e4fdd4c..5e1f0df 100644
--- a/src/main/java/com/amazon/carbonado/repo/replicated/ReplicatedRepository.java
+++ b/src/main/java/com/amazon/carbonado/repo/replicated/ReplicatedRepository.java
@@ -266,9 +266,11 @@ class ReplicatedRepository
mMasterRepository.close();
}
+ /*
public boolean isClosed() {
return mReplicaRepository.isClosed() || mMasterRepository.isClosed();
}
+ */
public String[] getUserStorableTypeNames() throws RepositoryException {
StorableInfoCapability replicaCap =
diff --git a/src/main/java/com/amazon/carbonado/spi/AbstractRepository.java b/src/main/java/com/amazon/carbonado/spi/AbstractRepository.java
index 03a6b75..bcb2a35 100644
--- a/src/main/java/com/amazon/carbonado/spi/AbstractRepository.java
+++ b/src/main/java/com/amazon/carbonado/spi/AbstractRepository.java
@@ -144,7 +144,6 @@ public abstract class AbstractRepository<Txn>
shutdown(false);
}
- @Override
public boolean isClosed() {
return transactionManager().isClosed();
}
--
cgit v1.2.3