From bc6bd171603696de353a7c0f500be929e59146c3 Mon Sep 17 00:00:00 2001 From: rkovarik Date: Thu, 20 Aug 2020 08:14:46 +0200 Subject: [PATCH] MGNLADVCACHE-111 register sites when multisite moduel is starting --- .../info/magnolia/multisite/MultiSiteModule.java | 32 ++++++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/src/main/java/info/magnolia/multisite/MultiSiteModule.java b/src/main/java/info/magnolia/multisite/MultiSiteModule.java index 2ede3bb..f8b6fdd 100644 --- a/src/main/java/info/magnolia/multisite/MultiSiteModule.java +++ b/src/main/java/info/magnolia/multisite/MultiSiteModule.java @@ -1,12 +1,31 @@ /** - * This file Copyright (c) 2008-2019 Magnolia International + * This file Copyright (c) 2020 Magnolia International * Ltd. (http://www.magnolia-cms.com). All rights reserved. * * - * This program and the accompanying materials are made - * available under the terms of the Magnolia Network Agreement - * which accompanies this distribution, and is available at - * http://www.magnolia-cms.com/mna.html + * This file is dual-licensed under both the Magnolia + * Network Agreement and the GNU General Public License. + * You may elect to use one or the other of these licenses. + * + * This file is distributed in the hope that it will be + * useful, but AS-IS and WITHOUT ANY WARRANTY; without even the + * implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE, TITLE, or NONINFRINGEMENT. + * Redistribution, except as permitted by whichever of the GPL + * or MNA you select, is prohibited. + * + * 1. For the GPL license (GPL), you can redistribute and/or + * modify this file under the terms of the GNU General + * Public License, Version 3, as published by the Free Software + * Foundation. You should have received a copy of the GNU + * General Public License, Version 3 along with this program; + * if not, write to the Free Software Foundation, Inc., 51 + * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * 2. For the Magnolia Network Agreement (MNA), this file + * and the accompanying materials are made available under the + * terms of the MNA which accompanies this distribution, and + * is available at http://www.magnolia-cms.com/mna.html * * Any modifications to this file must keep this entire header * intact. @@ -211,7 +230,8 @@ public class MultiSiteModule implements ModuleLifecycle, EnterpriseLicensedModul } catch (RepositoryException e) { log.warn("Unable to register observation for path [/modules/enterprise/license]."); } - } else if (moduleLifecycleContext.getPhase() == ModuleLifecycleContext.PHASE_MODULE_RESTART) { + } + if (moduleLifecycleContext.getPhase() != ModuleLifecycleContext.PHASE_SYSTEM_SHUTDOWN) { registerSites(sites); } -- 2.13.1