Return-Path: X-Original-To: apmail-curator-commits-archive@minotaur.apache.org Delivered-To: apmail-curator-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BA9FF18369 for ; Mon, 28 Mar 2016 22:39:55 +0000 (UTC) Received: (qmail 40519 invoked by uid 500); 28 Mar 2016 22:39:55 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 40389 invoked by uid 500); 28 Mar 2016 22:39:55 -0000 Mailing-List: contact commits-help@curator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@curator.apache.org Delivered-To: mailing list commits@curator.apache.org Received: (qmail 40357 invoked by uid 99); 28 Mar 2016 22:39:55 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Mar 2016 22:39:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5BB25E020D; Mon, 28 Mar 2016 22:39:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: randgalt@apache.org To: commits@curator.apache.org Date: Mon, 28 Mar 2016 22:39:56 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/4] curator git commit: added validation for DYNAMIC_SEQUENTIAL service type added a break in switch case added validation for DYNAMIC_SEQUENTIAL service type added a break in switch case Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/b75f92bf Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/b75f92bf Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/b75f92bf Branch: refs/heads/master Commit: b75f92bf2dbacd755c770373195a8444338041c8 Parents: 6ebc697 Author: nirdothan Authored: Mon Mar 21 12:09:48 2016 +0200 Committer: nirdothan Committed: Mon Mar 21 12:09:48 2016 +0200 ---------------------------------------------------------------------- .../apache/curator/x/discovery/server/rest/DiscoveryResource.java | 2 +- .../apache/curator/x/discovery/details/ServiceDiscoveryImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/b75f92bf/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/rest/DiscoveryResource.java ---------------------------------------------------------------------- diff --git a/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/rest/DiscoveryResource.java b/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/rest/DiscoveryResource.java index b4d9cb7..49c550b 100644 --- a/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/rest/DiscoveryResource.java +++ b/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/rest/DiscoveryResource.java @@ -90,7 +90,7 @@ public abstract class DiscoveryResource return Response.status(Response.Status.BAD_REQUEST).build(); } - if ( instance.getServiceType() == ServiceType.DYNAMIC ) + if ( instance.getServiceType() == ServiceType.DYNAMIC || instance.getServiceType() == ServiceType.DYNAMIC_SEQUENTIAL ) { log.info("Service type cannot be dynamic"); return Response.status(Response.Status.BAD_REQUEST).build(); http://git-wip-us.apache.org/repos/asf/curator/blob/b75f92bf/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/details/ServiceDiscoveryImpl.java ---------------------------------------------------------------------- diff --git a/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/details/ServiceDiscoveryImpl.java b/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/details/ServiceDiscoveryImpl.java index dd4d6ce..d0f21d4 100644 --- a/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/details/ServiceDiscoveryImpl.java +++ b/curator-x-discovery/src/main/java/org/apache/curator/x/discovery/details/ServiceDiscoveryImpl.java @@ -230,6 +230,7 @@ public class ServiceDiscoveryImpl implements ServiceDiscovery break; default: mode = CreateMode.PERSISTENT; + break; } client.create().creatingParentContainersIfNeeded().withMode(mode).forPath(path, bytes); isDone = true;