Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4D09218EA4 for ; Wed, 8 Jul 2015 17:47:17 +0000 (UTC) Received: (qmail 93214 invoked by uid 500); 8 Jul 2015 17:47:17 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 93170 invoked by uid 500); 8 Jul 2015 17:47:17 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 93161 invoked by uid 99); 8 Jul 2015 17:47:17 -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; Wed, 08 Jul 2015 17:47:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 04458E095F; Wed, 8 Jul 2015 17:47:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shameera@apache.org To: commits@airavata.apache.org Message-Id: <4442c9b7fda04d4e8b54a275d6f521ad@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: airavata git commit: configuration lazy loading Date: Wed, 8 Jul 2015 17:47:17 +0000 (UTC) Repository: airavata Updated Branches: refs/heads/master b7cee3e0b -> e060b47e8 configuration lazy loading Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e060b47e Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e060b47e Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e060b47e Branch: refs/heads/master Commit: e060b47e8ec25771b338646c0df0c36d38565246 Parents: b7cee3e Author: Shameera Rathanyaka Authored: Wed Jul 8 13:47:06 2015 -0400 Committer: Shameera Rathanyaka Committed: Wed Jul 8 13:47:06 2015 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/airavata/gfac/impl/Factory.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/e060b47e/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java index c2ce8dc..2b629bb 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/Factory.java @@ -23,7 +23,6 @@ package org.apache.airavata.gfac.impl; import com.google.common.eventbus.EventBus; import org.apache.airavata.common.exception.AiravataException; import org.apache.airavata.common.exception.ApplicationSettingsException; -import org.apache.airavata.common.utils.ApplicationSettings; import org.apache.airavata.common.utils.LocalEventPublisher; import org.apache.airavata.common.utils.ServerSettings; import org.apache.airavata.gfac.core.GFacEngine; @@ -85,6 +84,7 @@ public abstract class Factory { private static Map jobSubmissionTask = new HashMap<>(); private static Map dataMovementTask = new HashMap<>(); private static Map resources = new HashMap<>(); + private static boolean readConfig = false; public static GFacEngine getGFacEngine() throws GFacException { if (engine == null) { @@ -236,14 +236,14 @@ public abstract class Factory { public static JobSubmissionTask getJobSubmissionTask(JobSubmissionProtocol jobSubmissionProtocol) throws GFacException { - if (jobSubmissionTask == null) { + if (!readConfig) { loadConfiguration(); } return jobSubmissionTask.get(jobSubmissionProtocol); } public static Task getDataMovementTask(DataMovementProtocol dataMovementProtocol) throws GFacException { - if (dataMovementTask == null) { + if (!readConfig) { loadConfiguration(); } return dataMovementTask.get(dataMovementProtocol); @@ -251,7 +251,7 @@ public abstract class Factory { public static ResourceConfig getResourceConfig(ResourceJobManagerType resourceJobManagerType) throws GFacException { - if (resources == null) { + if (!readConfig) { loadConfiguration(); } return resources.get(resourceJobManagerType); @@ -270,6 +270,7 @@ public abstract class Factory { for (ResourceConfig resourceConfig : config.getResourceConfiguration()) { resources.put(resourceConfig.getJobManagerType(), resourceConfig); } + readConfig = true; }