[2/2] git commit: updated refs/heads/master to 40d12ad

[bh...@apache.org]

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 <ro...@shapeblue.com>


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 <ro...@shapeblue.com>
Authored: Thu Dec 8 00:29:46 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
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(-)
----------------------------------------------------------------------