This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.nosql.couchbase-client-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-nosql-couchbase-client.git
commit bf9f9aa771c5aa3925d0719115a66d1fbc03de4d Author: Stefan Seifert <[email protected]> AuthorDate: Thu May 21 07:12:11 2015 +0000 SLING-4381 fix logic error for buckets with password; update readme git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/nosql/couchbase-client@1680746 13f79535-47bb-0310-9956-ffa450edef68 --- .../sling/nosql/couchbase/client/impl/CouchbaseClientImpl.java | 4 ++-- .../impl/{CouchbaseUtil.java => CouchbaseEnvironmentSingleton.java} | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) 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 @@ public class CouchbaseClientImpl implements CouchbaseClient { } 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 94% 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 @@ import com.couchbase.client.java.env.DefaultCouchbaseEnvironment; /** * 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 @@ final class CouchbaseUtil { * @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 { -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
