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 965E8200BD8 for ; Wed, 7 Dec 2016 20:00:20 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 94E38160B26; Wed, 7 Dec 2016 19:00:20 +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 08D31160B0C for ; Wed, 7 Dec 2016 20:00:19 +0100 (CET) Received: (qmail 93370 invoked by uid 500); 7 Dec 2016 19:00:19 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 93352 invoked by uid 99); 7 Dec 2016 19:00:19 -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, 07 Dec 2016 19:00:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E2241E7DFC; Wed, 7 Dec 2016 19:00:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Date: Wed, 07 Dec 2016 19:00:19 -0000 Message-Id: <5472fcf386b14a059a1014a675b6868c@git.apache.org> In-Reply-To: <746e6552c3814557ac2a7fbf2443b9cf@git.apache.org> References: <746e6552c3814557ac2a7fbf2443b9cf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/master to 40d12ad archived-at: Wed, 07 Dec 2016 19:00:20 -0000 Merge pull request #1772 from syed/template-sync-fix CLOUDSTACK-9627 Fix template sync for region store.When using a region store like Swift or S3 as secondary storage, the `zoneId` can be null. This causes an exception when we try to convert it to a `long`. This fix guards against that. Before this fix, if you restart the management server, all the templates would change to "NOT READY" because the code which syncs the NFS cache and the object store crashes due to the above mentioned issue. This PR fixes that. * pr/1772: CLOUDSTACK-9627:Fix template sync for region store Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/40d12ad4 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/40d12ad4 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/40d12ad4 Branch: refs/heads/master Commit: 40d12ad40e665e1cc605e4a56adece3f00755d6d Parents: 0eb1069 5d274bb Author: Rohit Yadav Authored: Thu Dec 8 00:29:46 2016 +0530 Committer: Rohit Yadav Committed: Thu Dec 8 00:29:46 2016 +0530 ---------------------------------------------------------------------- .../storage/image/TemplateServiceImpl.java | 100 +++++++++---------- .../resource/NfsSecondaryStorageResource.java | 12 +-- 2 files changed, 56 insertions(+), 56 deletions(-) ----------------------------------------------------------------------