hg: jdk9/hs-rt/hotspot: 2 new changesets

[ioi.lam at oracle.com]

Changeset: f26a2f504e28
Author:    iklam
Date:      2015-06-17 13:22 -0700
URL:       http://hg.openjdk.java.net/jdk9/hs-rt/hotspot/rev/f26a2f504e28

8098815: Assertion failure in CDS shared string archive support on Windows
Summary: check for a zero length before calling the G1 fill_archive_regions routine
Reviewed-by: coleenp, iklam, dcubed
Contributed-by: tom.benson at oracle.com

! src/share/vm/memory/filemap.cpp

Changeset: 7128e27f94fb
Author:    iklam
Date:      2015-06-17 22:49 +0000
URL:       http://hg.openjdk.java.net/jdk9/hs-rt/hotspot/rev/7128e27f94fb

Merge