SLING-4381 fix logic error for buckets with password; update readme
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1680746 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseClientImpl.java b/src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseClientImpl.java
index a12a61f..5103ca4 100644
--- a/src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseClientImpl.java
+++ b/src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseClientImpl.java
@@ -97,8 +97,8 @@
}
try {
- cluster = CouchbaseUtil.createCluster(couchbaseHosts);
- bucket = CouchbaseUtil.openBucket(cluster, bucketName, bucketPassword);
+ cluster = CouchbaseEnvironmentSingleton.createCluster(couchbaseHosts);
+ bucket = CouchbaseEnvironmentSingleton.openBucket(cluster, bucketName, bucketPassword);
}
catch (Throwable ex) {
enabled = false;
diff --git a/src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseUtil.java b/src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseEnvironmentSingleton.java
similarity index 93%
rename from src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseUtil.java
rename to src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseEnvironmentSingleton.java
index 523870c..555fac8 100644
--- a/src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseUtil.java
+++ b/src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseEnvironmentSingleton.java
@@ -27,11 +27,11 @@
/**
* Manages couchbase environment.
*/
-final class CouchbaseUtil {
+final class CouchbaseEnvironmentSingleton {
private static final CouchbaseEnvironment COUCHBASE_ENVIRONMENT = DefaultCouchbaseEnvironment.builder().build();
- private CouchbaseUtil() {
+ private CouchbaseEnvironmentSingleton() {
// static methods only
}
@@ -52,7 +52,7 @@
* @return Couchbase bucket
*/
public static Bucket openBucket(Cluster cluster, String bucketName, String bucketPassword) {
- if (bucketPassword == null) {
+ if (bucketPassword != null) {
return cluster.openBucket(bucketName, bucketPassword);
}
else {
