Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id BF75C200ACA for ; Thu, 9 Jun 2016 20:07:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id BE248160A58; Thu, 9 Jun 2016 18:07:25 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 14096160A29 for ; Thu, 9 Jun 2016 20:07:24 +0200 (CEST) Received: (qmail 75504 invoked by uid 500); 9 Jun 2016 18:07:24 -0000 Mailing-List: contact commits-help@tomee.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tomee.apache.org Delivered-To: mailing list commits@tomee.apache.org Received: (qmail 75495 invoked by uid 99); 9 Jun 2016 18:07:24 -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; Thu, 09 Jun 2016 18:07:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2744ADFC74; Thu, 9 Jun 2016 18:07:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rmannibucau@apache.org To: commits@tomee.apache.org Message-Id: <642e5041834b42f69dc206205ab3b53f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: tomee git commit: adding static failover strategy Date: Thu, 9 Jun 2016 18:07:24 +0000 (UTC) archived-at: Thu, 09 Jun 2016 18:07:25 -0000 Repository: tomee Updated Branches: refs/heads/master 15a2879d4 -> ebb7d3ee2 adding static failover strategy Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ebb7d3ee Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ebb7d3ee Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ebb7d3ee Branch: refs/heads/master Commit: ebb7d3ee2667f08854f32f3b561fabb1db552d6c Parents: 15a2879 Author: Romain manni-Bucau Authored: Thu Jun 9 20:06:56 2016 +0200 Committer: Romain manni-Bucau Committed: Thu Jun 9 20:06:56 2016 +0200 ---------------------------------------------------------------------- .../openejb/resource/jdbc/router/FailOverRouter.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/ebb7d3ee/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/router/FailOverRouter.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/router/FailOverRouter.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/router/FailOverRouter.java index 44361f2..26cfedc 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/router/FailOverRouter.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/router/FailOverRouter.java @@ -179,6 +179,19 @@ public class FailOverRouter extends AbstractRouter { } }; break; + case "static": + strategyRuntime = new Strategy() { // no auto adaption (if first ds is always faster for instance) + @Override + public Collection prepare(final Collection list) { + return list; + } + + @Override + public void used(final DataSourceHolder holder) { + // no-op + } + }; + break; case DEFAULT_STRATEGY: default: strategyRuntime = new Strategy() { // use the list and save a working item as first one