<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>198442</bug_id>
          
          <creation_ts>2019-05-31 16:10:54 -0700</creation_ts>
          <short_desc>Make tests that use UIHelper more robust under certain configurations</short_desc>
          <delta_ts>2019-05-31 17:44:03 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Tools / Tests</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Wenson Hsieh">wenson_hsieh</reporter>
          <assigned_to name="Wenson Hsieh">wenson_hsieh</assigned_to>
          <cc>bdakin</cc>
    
    <cc>commit-queue</cc>
    
    <cc>megan_gardner</cc>
    
    <cc>rniwa</cc>
    
    <cc>thorton</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1540878</commentid>
    <comment_count>0</comment_count>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2019-05-31 16:10:54 -0700</bug_when>
    <thetext>&lt;rdar://problem/51301737&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1540888</commentid>
    <comment_count>1</comment_count>
      <attachid>371096</attachid>
    <who name="Wenson Hsieh">wenson_hsieh</who>
    <bug_when>2019-05-31 16:25:52 -0700</bug_when>
    <thetext>Created attachment 371096
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1540904</commentid>
    <comment_count>2</comment_count>
      <attachid>371096</attachid>
    <who name="Ryosuke Niwa">rniwa</who>
    <bug_when>2019-05-31 17:04:27 -0700</bug_when>
    <thetext>Comment on attachment 371096
Patch

Nice!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1540912</commentid>
    <comment_count>3</comment_count>
      <attachid>371096</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2019-05-31 17:44:02 -0700</bug_when>
    <thetext>Comment on attachment 371096
Patch

Clearing flags on attachment: 371096

Committed r246004: &lt;https://trac.webkit.org/changeset/246004&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1540913</commentid>
    <comment_count>4</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2019-05-31 17:44:03 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>371096</attachid>
            <date>2019-05-31 16:25:52 -0700</date>
            <delta_ts>2019-05-31 17:44:02 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-198442-20190531162551.patch</filename>
            <type>text/plain</type>
            <size>16138</size>
            <attacher name="Wenson Hsieh">wenson_hsieh</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1OTkzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTk4N2YxZjlhZjNlYTUxNWI2YzQ2MmE2ZTE1OTJlYjMy
NTg4OTI0Zi4uYzM5ZTc2MWFmM2ViZDU4MTI2YzcyYzUzZTBhMmE5MWI1MDZiYzZkZiAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5
IEBACisyMDE5LTA1LTMxICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgor
CisgICAgICAgIE1ha2UgdGVzdHMgdGhhdCB1c2UgVUlIZWxwZXIgbW9yZSByb2J1c3QgdW5kZXIg
Y2VydGFpbiBjb25maWd1cmF0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z
aG93X2J1Zy5jZ2k/aWQ9MTk4NDQyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MTMwMTczNz4K
KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb3IgYSBj
ZXJ0YWluIGRldmljZSBjbGFzcywgbWFueSB0ZXN0cyB0aGF0IGF0dGVtcHQgdG8gdXNlIFVJSGVs
cGVyLmlzSU9TIGFyZSBjdXJyZW50bHkgZmFpbGluZy4gV2UgY2FuIGZpeCB0aGlzCisgICAgICAg
IGJ5IG1ha2luZyB0aGUgYGlzSU9TYCBjaGVjayBtb3JlIHJvYnVzdDsgdGhpcyBwYXRjaCBhbHNv
IHJlbmFtZXMgYGlzSU9TYCB0byBgaXNJT1NGYW1pbHlgLCB3aGljaCBpcyBtb3JlCisgICAgICAg
IGFjY3VyYXRlIChhbmQgY29uc2lzdGVudCB3aXRoIHRoZSBjb3JyZXNwb25kaW5nIFBMQVRGT1JN
IG1hY3JvIG5hbWUpLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRs
ZS9CaW5kaW5ncy9UZXN0UnVubmVyLmlkbDoKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0lu
amVjdGVkQnVuZGxlL1Rlc3RSdW5uZXIuaDoKKyAgICAgICAgKFdUUjo6VGVzdFJ1bm5lcjo6aXNJ
T1NGYW1pbHkgY29uc3QpOgorCiAyMDE5LTA1LTMxICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0
b25AYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT046IFdlYktpdC5JbnRlcmFjdGlvbkRl
YWRsb2NrQWZ0ZXJDcmFzaCBhbmQgU3luY2hyb25vdXNUaW1lb3V0VGVzdHMuVW5yZXNwb25zaXZl
UGFnZURvZXNOb3RDYXVzZVBvc2l0aW9uSW5mb3JtYXRpb25Ub0hhbmdVSSBBUEkgdGVzdHMgYXJl
IGZhaWxpbmcKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5k
bGUvQmluZGluZ3MvVGVzdFJ1bm5lci5pZGwgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVj
dGVkQnVuZGxlL0JpbmRpbmdzL1Rlc3RSdW5uZXIuaWRsCmluZGV4IGY2ZTc5MDk2NDA2MGQ1NzVj
ZTdhOTY2MDA0MjA4MDA1MmFjYmVmODkuLjQ4Zjc0ZTdlN2NlMGRhYmNiZTkyNmU4MTRmOTA2Yjcz
NjEzNmE1OTIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5k
bGUvQmluZGluZ3MvVGVzdFJ1bm5lci5pZGwKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9J
bmplY3RlZEJ1bmRsZS9CaW5kaW5ncy9UZXN0UnVubmVyLmlkbApAQCAtMjUsNiArMjUsNyBAQAog
CiBpbnRlcmZhY2UgVGVzdFJ1bm5lciB7CiAgICAgcmVhZG9ubHkgYXR0cmlidXRlIGJvb2xlYW4g
aXNXZWJLaXQyOworICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBib29sZWFuIGlzSU9TRmFtaWx5Owog
CiAgICAgLy8gVGhlIGJhc2ljcy4KICAgICB2b2lkIGR1bXBBc1RleHQoYm9vbGVhbiBkdW1wUGl4
ZWxzKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUv
VGVzdFJ1bm5lci5oIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9UZXN0
UnVubmVyLmgKaW5kZXggMzkyNDRlMzVjZGNjNjNmMWRkZTVmNDJiYTZiZWNlNGQxMmE2YTc1Yi4u
M2EyNmIwNWMxYjhhMjNlMzFiYWM0ZGY4MmE1OTI0OTQxOWQ4ZDZjYyAxMDA2NDQKLS0tIGEvVG9v
bHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9UZXN0UnVubmVyLmgKKysrIGIvVG9v
bHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9UZXN0UnVubmVyLmgKQEAgLTQ4LDYg
KzQ4LDE1IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgbWFrZVdpbmRvd09iamVjdChKU0NvbnRleHRS
ZWYsIEpTT2JqZWN0UmVmIHdpbmRvd09iamVjdCwgSlNWYWx1ZVJlZiogZXhjZXB0aW9uKTsKIAor
ICAgIGJvb2wgaXNJT1NGYW1pbHkoKSBjb25zdAorICAgIHsKKyNpZiBQTEFURk9STShJT1NfRkFN
SUxZKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyNlbHNlCisgICAgICAgIHJldHVybiBmYWxzZTsK
KyNlbmRpZgorICAgIH0KKwogICAgIGJvb2wgaXNXZWJLaXQyKCkgY29uc3QgeyByZXR1cm4gdHJ1
ZTsgfQogCiAgICAgLy8gVGhlIGJhc2ljcy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n
ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA0MDIxZDNkODg4MjU1YmQ0OWE5ODYz
OWRlYmRjNzRkM2YzNTliMGFjLi45ZjFiNjIyYTViY2UxMzNiZmMwNDMxMGIzZWE3MTI1NzU2MGE2
NGRmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv
Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTktMDUtMzEgIFdlbnNvbiBIc2llaCAgPHdl
bnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSB0ZXN0cyB0aGF0IHVzZSBVSUhl
bHBlciBtb3JlIHJvYnVzdCB1bmRlciBjZXJ0YWluIGNvbmZpZ3VyYXRpb25zCisgICAgICAgIGh0
dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg0NDIKKyAgICAgICAgPHJk
YXI6Ly9wcm9ibGVtLzUxMzAxNzM3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q
UyEpLgorCisgICAgICAgIFJlcGxhY2UgdXNhZ2VzIG9mIGBVSUhlbHBlci5pc0lPU2Agd2l0aCBg
VUlIZWxwZXIuaXNJT1NGYW1pbHlgLgorCisgICAgICAgICogZmFzdC9kb20vaWZyYW1lLWlubmVy
LXNpemUtc2NhbGluZy5odG1sOgorICAgICAgICAqIGZhc3QvZm9ybXMvZGF0YWxpc3QvZGF0YWxp
c3Qtc2hvdy1oaWRlLmh0bWw6CisgICAgICAgICogZmFzdC9mb3Jtcy9kYXRhbGlzdC9kYXRhbGlz
dC10ZXh0aW5wdXQtc3VnZ2VzdGlvbnMtb3JkZXIuaHRtbDoKKyAgICAgICAgKiBmYXN0L3Njcm9s
bGluZy9pb3MvcmV2ZWFsLWZvY3VzZWQtZWxlbWVudC1yaWdodC1hYm92ZS1rZXlib2FyZC1vbi1p
cGFkLmh0bWw6CisKKyAgICAgICAgQWxzbyByZW1vdmUgYSB3b3JrYXJvdW5kIGhlcmUgdGhhdCBm
b3JjZXMgYGlzSU9TYCB0byByZXR1cm4gYHRydWVgLgorCisgICAgICAgICogcmVzb3VyY2VzL3Vp
LWhlbHBlci5qczoKKyAgICAgICAgKHdpbmRvdy5VSUhlbHBlci5pc0lPU0ZhbWlseSk6CisgICAg
ICAgICh3aW5kb3cuVUlIZWxwZXIuaXNXZWJLaXQyKToKKyAgICAgICAgKHdpbmRvdy5VSUhlbHBl
ci5odW1hblNwZWVkRG91YmxlVGFwQXQpOgorICAgICAgICAod2luZG93LlVJSGVscGVyLmh1bWFu
U3BlZWRab29tQnlEb3VibGVUYXBwaW5nQXQpOgorICAgICAgICAod2luZG93LlVJSGVscGVyLnpv
b21CeURvdWJsZVRhcHBpbmdBdCk6CisgICAgICAgICh3aW5kb3cuVUlIZWxwZXIuYXN5bmMuZG91
YmxlQWN0aXZhdGVBdCk6CisgICAgICAgICh3aW5kb3cuVUlIZWxwZXIuYXN5bmMuZG91YmxlQWN0
aXZhdGVBdFNlbGVjdGlvblN0YXJ0KToKKyAgICAgICAgKHdpbmRvdy5VSUhlbHBlci5hc3luYy5z
ZWxlY3RXb3JkQnlEb3VibGVUYXBPckNsaWNrKToKKyAgICAgICAgKHdpbmRvdy5VSUhlbHBlci5r
ZXlEb3duKToKKyAgICAgICAgKHdpbmRvdy5VSUhlbHBlci5kZWFjdGl2YXRlRm9ybUNvbnRyb2wp
OgorICAgICAgICAod2luZG93LlVJSGVscGVyLnR5cGVDaGFyYWN0ZXIpOgorICAgICAgICAod2lu
ZG93LlVJSGVscGVyLmlucHV0Vmlld0JvdW5kcyk6CisgICAgICAgICh3aW5kb3cuVUlIZWxwZXIu
Y29udGVudE9mZnNldCk6CisgICAgICAgICh3aW5kb3cuVUlIZWxwZXIuaXNJT1MpOiBEZWxldGVk
LgorCiAyMDE5LTA1LTMxICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAg
ICAgIFtpT1NdIFJldmVhbCB0aGUgZm9jdXNlZCBlbGVtZW50IHdoZW4gaXQncyBpbW1lZGlhdGVs
eSBhYm92ZSBzb2Z0d2FyZSBrZXlib2FyZApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9k
b20vaWZyYW1lLWlubmVyLXNpemUtc2NhbGluZy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9kb20v
aWZyYW1lLWlubmVyLXNpemUtc2NhbGluZy5odG1sCmluZGV4IGZhMjgyMTI3OWUzMTQ0YjEwOWI2
MDdkNGNmMWQzZjkwNjNlNmVlZmYuLmU3YmExMzQ3YTNkY2QzNWM5OTAyNDJjZWNhMWQyNTNkN2I5
N2FmZDggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvZG9tL2lmcmFtZS1pbm5lci1zaXpl
LXNjYWxpbmcuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9pZnJhbWUtaW5uZXItc2l6
ZS1zY2FsaW5nLmh0bWwKQEAgLTE3LDcgKzE3LDcgQEAKICAgICAgICAgICAgIHNob3VsZEJlTm9u
WmVybygiZnJhbWUuY29udGVudFdpbmRvdy5pbm5lckhlaWdodCIpOwogICAgICAgICAgICAgc2hv
dWxkQmUoImZyYW1lLmNvbnRlbnRXaW5kb3cuaW5uZXJXaWR0aCIsICJvcmlnaW5hbFdpZHRoIik7
CiAgICAgICAgICAgICAKLSAgICAgICAgICAgIHNjcm9sbGJhcldpZHRoID0gVUlIZWxwZXIuaXNJ
T1MoKSA/IDAgOiAxNTsKKyAgICAgICAgICAgIHNjcm9sbGJhcldpZHRoID0gVUlIZWxwZXIuaXNJ
T1NGYW1pbHkoKSA/IDAgOiAxNTsKICAgICAgICAgICAgIHNob3VsZEJlKCJmcmFtZS5jb250ZW50
V2luZG93LmlubmVySGVpZ2h0IiwgIm9yaWdpbmFsSGVpZ2h0IC0gc2Nyb2xsYmFyV2lkdGgiKTsK
ICAgICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9MYXlv
dXRUZXN0cy9mYXN0L2Zvcm1zL2RhdGFsaXN0L2RhdGFsaXN0LXNob3ctaGlkZS5odG1sIGIvTGF5
b3V0VGVzdHMvZmFzdC9mb3Jtcy9kYXRhbGlzdC9kYXRhbGlzdC1zaG93LWhpZGUuaHRtbAppbmRl
eCBlMzNlM2E2MGNiNTNhYzg3Nzk0ZDcxZmU5NzcwMTE3NjY5OGM3ODdhLi43MDY0N2RlNGZjZmQ3
N2M5MjQ5ZGNhZjFmNDBlYjMyMDA3YTQxYjUxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0
L2Zvcm1zL2RhdGFsaXN0L2RhdGFsaXN0LXNob3ctaGlkZS5odG1sCisrKyBiL0xheW91dFRlc3Rz
L2Zhc3QvZm9ybXMvZGF0YWxpc3QvZGF0YWxpc3Qtc2hvdy1oaWRlLmh0bWwKQEAgLTUwLDE0ICs1
MCwxNCBAQCBmdW5jdGlvbiB3YWl0Rm9yRGF0YUxpc3RTdWdnZXN0aW9uc1RvQ2hhbmdlVmlzaWJp
bGl0eSh2aXNpYmxlKQogYXN5bmMgZnVuY3Rpb24gcnVuVGVzdCgpIHsKICAgICBhd2FpdCBVSUhl
bHBlci5hY3RpdmF0ZUFuZFdhaXRGb3JJbnB1dFNlc3Npb25BdCgxNTAsIDI1KTsKIAotICAgIGlm
IChVSUhlbHBlci5pc0lPUygpKSB7CisgICAgaWYgKFVJSGVscGVyLmlzSU9TRmFtaWx5KCkpIHsK
ICAgICAgICAgYXdhaXQgVUlIZWxwZXIudGFwQXQoMjkwLCAzMCk7CiAgICAgICAgIGF3YWl0IHdh
aXRGb3JEYXRhTGlzdFN1Z2dlc3Rpb25zVG9DaGFuZ2VWaXNpYmlsaXR5KHRydWUpOwogICAgIH0K
IAogICAgIGJlZm9yZS50ZXh0Q29udGVudCA9IGF3YWl0IFVJSGVscGVyLmlzU2hvd2luZ0RhdGFM
aXN0U3VnZ2VzdGlvbnMoKTsKIAotICAgIGlmIChVSUhlbHBlci5pc0lPUygpKSB7CisgICAgaWYg
KFVJSGVscGVyLmlzSU9TRmFtaWx5KCkpIHsKICAgICAgICAgYXdhaXQgVUlIZWxwZXIudGFwQXQo
MTUwLCAyNSk7CiAgICAgICAgIGF3YWl0IHdhaXRGb3JEYXRhTGlzdFN1Z2dlc3Rpb25zVG9DaGFu
Z2VWaXNpYmlsaXR5KGZhbHNlKTsKICAgICB9IGVsc2UKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz
L2Zhc3QvZm9ybXMvZGF0YWxpc3QvZGF0YWxpc3QtdGV4dGlucHV0LXN1Z2dlc3Rpb25zLW9yZGVy
Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL2RhdGFsaXN0L2RhdGFsaXN0LXRleHRpbnB1
dC1zdWdnZXN0aW9ucy1vcmRlci5odG1sCmluZGV4IDYwZjE2NDBlOWY4ZDcxM2I5MDBiOGM4M2Rk
ZDI2Njk4ODhkOGYyZjguLmJmNTdiM2E0YmFiMDlkNTJkNjM5ZTZkOWQ2ZmU1YzgxOTAxNWYzNDMg
MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvZGF0YWxpc3QvZGF0YWxpc3QtdGV4
dGlucHV0LXN1Z2dlc3Rpb25zLW9yZGVyLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jt
cy9kYXRhbGlzdC9kYXRhbGlzdC10ZXh0aW5wdXQtc3VnZ2VzdGlvbnMtb3JkZXIuaHRtbApAQCAt
NDUsNyArNDUsNyBAQCBmdW5jdGlvbiBmb2N1c0lucHV0RmllbGRBbmRDaG9vc2VGaXJzdFN1Z2dl
c3Rpb24oKQogewogICAgIHJldHVybiBuZXcgUHJvbWlzZShhc3luYyByZXNvbHZlID0+IHsKICAg
ICAgICAgYXdhaXQgVUlIZWxwZXIuYWN0aXZhdGVBbmRXYWl0Rm9ySW5wdXRTZXNzaW9uQXQoMTAw
LCAyNSk7Ci0gICAgICAgIGlmIChVSUhlbHBlci5pc0lPUygpKSB7CisgICAgICAgIGlmIChVSUhl
bHBlci5pc0lPU0ZhbWlseSgpKSB7CiAgICAgICAgICAgICBhd2FpdCBVSUhlbHBlci50YXBBdCgy
OTAsIDMwKTsKICAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLnJlc2lnbkZpcnN0UmVzcG9uZGVy
KCk7CiAgICAgICAgICAgICBhd2FpdCBVSUhlbHBlci53YWl0Rm9yS2V5Ym9hcmRUb0hpZGUoKTsK
ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL2lvcy9yZXZlYWwtZm9jdXNl
ZC1lbGVtZW50LXJpZ2h0LWFib3ZlLWtleWJvYXJkLW9uLWlwYWQuaHRtbCBiL0xheW91dFRlc3Rz
L2Zhc3Qvc2Nyb2xsaW5nL2lvcy9yZXZlYWwtZm9jdXNlZC1lbGVtZW50LXJpZ2h0LWFib3ZlLWtl
eWJvYXJkLW9uLWlwYWQuaHRtbAppbmRleCA2M2RhMzZmYTNlOTVjZTQ3ZWRjZWNkYWE2ODVjYTIx
ZGNlMmQ2NDA2Li4zNTc2NjNmYWJjNWEwYjg3N2E1YTk3MDI3ZWI3YWQxNjgzNTVmNGI2IDEwMDY0
NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9pb3MvcmV2ZWFsLWZvY3VzZWQtZWxl
bWVudC1yaWdodC1hYm92ZS1rZXlib2FyZC1vbi1pcGFkLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMv
ZmFzdC9zY3JvbGxpbmcvaW9zL3JldmVhbC1mb2N1c2VkLWVsZW1lbnQtcmlnaHQtYWJvdmUta2V5
Ym9hcmQtb24taXBhZC5odG1sCkBAIC0zMCw3ICszMCw2IEBAIGFzeW5jIGZ1bmN0aW9uIHJ1blRl
c3QoKSB7CiAgICAgY29uc3QgcmVzaXplRXZlbnQgPSBsaXN0ZW5Gb3JFdmVudE9uY2UodGFyZ2V0
LCAnZm9jdXMnKS50aGVuKCgpID0+IGxpc3RlbkZvckV2ZW50T25jZSh2aXN1YWxWaWV3cG9ydCwg
J3Jlc2l6ZScpKTsKIAogICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikgewotICAgICAgICBVSUhl
bHBlci5pc0lPUyA9ICgpID0+IHRydWU7CiAgICAgICAgIGF3YWl0IFVJSGVscGVyLnNldEhhcmR3
YXJlS2V5Ym9hcmRBdHRhY2hlZChmYWxzZSk7CiAgICAgICAgIGF3YWl0IFVJSGVscGVyLmFjdGl2
YXRlRWxlbWVudEFuZFdhaXRGb3JJbnB1dFNlc3Npb24odGFyZ2V0KTsKICAgICB9CmRpZmYgLS1n
aXQgYS9MYXlvdXRUZXN0cy9yZXNvdXJjZXMvdWktaGVscGVyLmpzIGIvTGF5b3V0VGVzdHMvcmVz
b3VyY2VzL3VpLWhlbHBlci5qcwppbmRleCAwYmQ1YWJhNzU2OTMzYmY0MzRjZGVhMzE4YTJhYmQ2
MDdkMGMyNzhhLi42YWE2NzU1MGViMWYyMmIxMzY4OGUxM2JkNDhmMjg2OWI5NGU0MjE1IDEwMDY0
NAotLS0gYS9MYXlvdXRUZXN0cy9yZXNvdXJjZXMvdWktaGVscGVyLmpzCisrKyBiL0xheW91dFRl
c3RzL3Jlc291cmNlcy91aS1oZWxwZXIuanMKQEAgLTEsMTMgKzEsMTMgQEAKIAogd2luZG93LlVJ
SGVscGVyID0gY2xhc3MgVUlIZWxwZXIgewotICAgIHN0YXRpYyBpc0lPUygpCisgICAgc3RhdGlj
IGlzSU9TRmFtaWx5KCkKICAgICB7Ci0gICAgICAgIHJldHVybiBuYXZpZ2F0b3IudXNlckFnZW50
LmluY2x1ZGVzKCdpUGhvbmUnKSB8fCBuYXZpZ2F0b3IudXNlckFnZW50LmluY2x1ZGVzKCdpUGFk
Jyk7CisgICAgICAgIHJldHVybiB0ZXN0UnVubmVyLmlzSU9TRmFtaWx5OwogICAgIH0KIAogICAg
IHN0YXRpYyBpc1dlYktpdDIoKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHdpbmRvdy50ZXN0UnVu
bmVyLmlzV2ViS2l0MjsKKyAgICAgICAgcmV0dXJuIHRlc3RSdW5uZXIuaXNXZWJLaXQyOwogICAg
IH0KIAogICAgIHN0YXRpYyBkb3VibGVDbGlja0F0KHgsIHkpCkBAIC0zMSw3ICszMSw3IEBAIHdp
bmRvdy5VSUhlbHBlciA9IGNsYXNzIFVJSGVscGVyIHsKIAogICAgIHN0YXRpYyB0YXBBdCh4LCB5
LCBtb2RpZmllcnM9W10pCiAgICAgewotICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLmlzSU9T
KCkpOworICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLmlzSU9TRmFtaWx5KCkpOwogCiAgICAg
ICAgIGlmICghdGhpcy5pc1dlYktpdDIoKSkgewogICAgICAgICAgICAgY29uc29sZS5hc3NlcnQo
IW1vZGlmaWVycyB8fCAhbW9kaWZpZXJzLmxlbmd0aCk7CkBAIC01Miw3ICs1Miw3IEBAIHdpbmRv
dy5VSUhlbHBlciA9IGNsYXNzIFVJSGVscGVyIHsKIAogICAgIHN0YXRpYyBkb3VibGVUYXBBdCh4
LCB5KQogICAgIHsKLSAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5pc0lPUygpKTsKKyAgICAg
ICAgY29uc29sZS5hc3NlcnQodGhpcy5pc0lPU0ZhbWlseSgpKTsKIAogICAgICAgICBpZiAoIXRo
aXMuaXNXZWJLaXQyKCkpIHsKICAgICAgICAgICAgIGV2ZW50U2VuZGVyLmFkZFRvdWNoUG9pbnQo
eCwgeSk7CkBAIC03Niw3ICs3Niw3IEBAIHdpbmRvdy5VSUhlbHBlciA9IGNsYXNzIFVJSGVscGVy
IHsKIAogICAgIHN0YXRpYyBodW1hblNwZWVkRG91YmxlVGFwQXQoeCwgeSkKICAgICB7Ci0gICAg
ICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuaXNJT1MoKSk7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0
KHRoaXMuaXNJT1NGYW1pbHkoKSk7CiAKICAgICAgICAgaWYgKCF0aGlzLmlzV2ViS2l0MigpKSB7
CiAgICAgICAgICAgICAvLyBGSVhNRTogQWRkIGEgc2xlZXAgaW4gaGVyZS4KQEAgLTEwMSw3ICsx
MDEsNyBAQCB3aW5kb3cuVUlIZWxwZXIgPSBjbGFzcyBVSUhlbHBlciB7CiAKICAgICBzdGF0aWMg
aHVtYW5TcGVlZFpvb21CeURvdWJsZVRhcHBpbmdBdCh4LCB5KQogICAgIHsKLSAgICAgICAgY29u
c29sZS5hc3NlcnQodGhpcy5pc0lPUygpKTsKKyAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5p
c0lPU0ZhbWlseSgpKTsKIAogICAgICAgICBpZiAoIXRoaXMuaXNXZWJLaXQyKCkpIHsKICAgICAg
ICAgICAgIC8vIEZJWE1FOiBBZGQgYSBzbGVlcCBpbiBoZXJlLgpAQCAtMTMzLDcgKzEzMyw3IEBA
IHdpbmRvdy5VSUhlbHBlciA9IGNsYXNzIFVJSGVscGVyIHsKIAogICAgIHN0YXRpYyB6b29tQnlE
b3VibGVUYXBwaW5nQXQoeCwgeSkKICAgICB7Ci0gICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMu
aXNJT1MoKSk7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuaXNJT1NGYW1pbHkoKSk7CiAK
ICAgICAgICAgaWYgKCF0aGlzLmlzV2ViS2l0MigpKSB7CiAgICAgICAgICAgICBldmVudFNlbmRl
ci5hZGRUb3VjaFBvaW50KHgsIHkpOwpAQCAtMTU5LDcgKzE1OSw3IEBAIHdpbmRvdy5VSUhlbHBl
ciA9IGNsYXNzIFVJSGVscGVyIHsKIAogICAgIHN0YXRpYyBhY3RpdmF0ZUF0KHgsIHkpCiAgICAg
ewotICAgICAgICBpZiAoIXRoaXMuaXNXZWJLaXQyKCkgfHwgIXRoaXMuaXNJT1MoKSkgeworICAg
ICAgICBpZiAoIXRoaXMuaXNXZWJLaXQyKCkgfHwgIXRoaXMuaXNJT1NGYW1pbHkoKSkgewogICAg
ICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oeCwgeSk7CiAgICAgICAgICAgICBldmVu
dFNlbmRlci5tb3VzZURvd24oKTsKICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlVXAoKTsK
QEAgLTE4Myw3ICsxODMsNyBAQCB3aW5kb3cuVUlIZWxwZXIgPSBjbGFzcyBVSUhlbHBlciB7CiAK
ICAgICBzdGF0aWMgYXN5bmMgZG91YmxlQWN0aXZhdGVBdCh4LCB5KQogICAgIHsKLSAgICAgICAg
aWYgKHRoaXMuaXNJT1MoKSkKKyAgICAgICAgaWYgKHRoaXMuaXNJT1NGYW1pbHkoKSkKICAgICAg
ICAgICAgIGF3YWl0IFVJSGVscGVyLmRvdWJsZVRhcEF0KHgsIHkpOwogICAgICAgICBlbHNlCiAg
ICAgICAgICAgICBhd2FpdCBVSUhlbHBlci5kb3VibGVDbGlja0F0KHgsIHkpOwpAQCAtMTk0LDcg
KzE5NCw3IEBAIHdpbmRvdy5VSUhlbHBlciA9IGNsYXNzIFVJSGVscGVyIHsKICAgICAgICAgY29u
c3QgcmVjdHMgPSB3aW5kb3cuZ2V0U2VsZWN0aW9uKCkuZ2V0UmFuZ2VBdCgwKS5nZXRDbGllbnRS
ZWN0cygpOwogICAgICAgICBjb25zdCB4ID0gcmVjdHNbMF0ubGVmdDsKICAgICAgICAgY29uc3Qg
eSA9IHJlY3RzWzBdLnRvcDsKLSAgICAgICAgaWYgKHRoaXMuaXNJT1MoKSkgeworICAgICAgICBp
ZiAodGhpcy5pc0lPU0ZhbWlseSgpKSB7CiAgICAgICAgICAgICBhd2FpdCBVSUhlbHBlci5hY3Rp
dmF0ZUFuZFdhaXRGb3JJbnB1dFNlc3Npb25BdCh4LCB5KTsKICAgICAgICAgICAgIGF3YWl0IFVJ
SGVscGVyLmRvdWJsZVRhcEF0KHgsIHkpOwogICAgICAgICAgICAgLy8gVGhpcyBpcyBvbmx5IGhl
cmUgdG8gZGVhbCB3aXRoIGFzeW5jL3N5bmMgY29weS9wYXN0ZSBjYWxscywgc28KQEAgLTIwOSw3
ICsyMDksNyBAQCB3aW5kb3cuVUlIZWxwZXIgPSBjbGFzcyBVSUhlbHBlciB7CiAgICAgICAgIGNv
bnN0IGJvdW5kaW5nUmVjdCA9IGVsZW1lbnQuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCk7CiAgICAg
ICAgIGNvbnN0IHggPSBib3VuZGluZ1JlY3QueCArIHJlbGF0aXZlWDsKICAgICAgICAgY29uc3Qg
eSA9IGJvdW5kaW5nUmVjdC55ICsgcmVsYXRpdmVZOwotICAgICAgICBpZiAodGhpcy5pc0lPUygp
KSB7CisgICAgICAgIGlmICh0aGlzLmlzSU9TRmFtaWx5KCkpIHsKICAgICAgICAgICAgIGF3YWl0
IFVJSGVscGVyLmFjdGl2YXRlQW5kV2FpdEZvcklucHV0U2Vzc2lvbkF0KHgsIHkpOwogICAgICAg
ICAgICAgYXdhaXQgVUlIZWxwZXIuZG91YmxlVGFwQXQoeCwgeSk7CiAgICAgICAgICAgICAvLyBU
aGlzIGlzIG9ubHkgaGVyZSB0byBkZWFsIHdpdGggYXN5bmMvc3luYyBjb3B5L3Bhc3RlIGNhbGxz
LCBzbwpAQCAtMjIyLDcgKzIyMiw3IEBAIHdpbmRvdy5VSUhlbHBlciA9IGNsYXNzIFVJSGVscGVy
IHsKIAogICAgIHN0YXRpYyBrZXlEb3duKGtleSwgbW9kaWZpZXJzPVtdKQogICAgIHsKLSAgICAg
ICAgaWYgKCF0aGlzLmlzV2ViS2l0MigpIHx8ICF0aGlzLmlzSU9TKCkpIHsKKyAgICAgICAgaWYg
KCF0aGlzLmlzV2ViS2l0MigpIHx8ICF0aGlzLmlzSU9TRmFtaWx5KCkpIHsKICAgICAgICAgICAg
IGV2ZW50U2VuZGVyLmtleURvd24oa2V5LCBtb2RpZmllcnMpOwogICAgICAgICAgICAgcmV0dXJu
IFByb21pc2UucmVzb2x2ZSgpOwogICAgICAgICB9CkBAIC0zMTEsNyArMzExLDcgQEAgd2luZG93
LlVJSGVscGVyID0gY2xhc3MgVUlIZWxwZXIgewogCiAgICAgc3RhdGljIGFjdGl2YXRlQW5kV2Fp
dEZvcklucHV0U2Vzc2lvbkF0KHgsIHkpCiAgICAgewotICAgICAgICBpZiAoIXRoaXMuaXNXZWJL
aXQyKCkgfHwgIXRoaXMuaXNJT1MoKSkKKyAgICAgICAgaWYgKCF0aGlzLmlzV2ViS2l0MigpIHx8
ICF0aGlzLmlzSU9TRmFtaWx5KCkpCiAgICAgICAgICAgICByZXR1cm4gdGhpcy5hY3RpdmF0ZUF0
KHgsIHkpOwogCiAgICAgICAgIHJldHVybiBuZXcgUHJvbWlzZShyZXNvbHZlID0+IHsKQEAgLTMz
NCw3ICszMzQsNyBAQCB3aW5kb3cuVUlIZWxwZXIgPSBjbGFzcyBVSUhlbHBlciB7CiAKICAgICBz
dGF0aWMgYWN0aXZhdGVGb3JtQ29udHJvbChlbGVtZW50KQogICAgIHsKLSAgICAgICAgaWYgKCF0
aGlzLmlzV2ViS2l0MigpIHx8ICF0aGlzLmlzSU9TKCkpCisgICAgICAgIGlmICghdGhpcy5pc1dl
YktpdDIoKSB8fCAhdGhpcy5pc0lPU0ZhbWlseSgpKQogICAgICAgICAgICAgcmV0dXJuIHRoaXMu
YWN0aXZhdGVFbGVtZW50KGVsZW1lbnQpOwogCiAgICAgICAgIGNvbnN0IHggPSBlbGVtZW50Lm9m
ZnNldExlZnQgKyBlbGVtZW50Lm9mZnNldFdpZHRoIC8gMjsKQEAgLTM2Nyw3ICszNjcsNyBAQCB3
aW5kb3cuVUlIZWxwZXIgPSBjbGFzcyBVSUhlbHBlciB7CiAKICAgICBzdGF0aWMgZGVhY3RpdmF0
ZUZvcm1Db250cm9sKGVsZW1lbnQpCiAgICAgewotICAgICAgICBpZiAoIXRoaXMuaXNXZWJLaXQy
KCkgfHwgIXRoaXMuaXNJT1MoKSkgeworICAgICAgICBpZiAoIXRoaXMuaXNXZWJLaXQyKCkgfHwg
IXRoaXMuaXNJT1NGYW1pbHkoKSkgewogICAgICAgICAgICAgZWxlbWVudC5ibHVyKCk7CiAgICAg
ICAgICAgICByZXR1cm4gUHJvbWlzZS5yZXNvbHZlKCk7CiAgICAgICAgIH0KQEAgLTM4NCw3ICsz
ODQsNyBAQCB3aW5kb3cuVUlIZWxwZXIgPSBjbGFzcyBVSUhlbHBlciB7CiAKICAgICBzdGF0aWMg
d2FpdEZvclBvcG92ZXJUb1ByZXNlbnQoKQogICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLmlzV2Vi
S2l0MigpIHx8ICF0aGlzLmlzSU9TKCkpCisgICAgICAgIGlmICghdGhpcy5pc1dlYktpdDIoKSB8
fCAhdGhpcy5pc0lPU0ZhbWlseSgpKQogICAgICAgICAgICAgcmV0dXJuIFByb21pc2UucmVzb2x2
ZSgpOwogCiAgICAgICAgIHJldHVybiBuZXcgUHJvbWlzZShyZXNvbHZlID0+IHsKQEAgLTQwMCw3
ICs0MDAsNyBAQCB3aW5kb3cuVUlIZWxwZXIgPSBjbGFzcyBVSUhlbHBlciB7CiAKICAgICBzdGF0
aWMgd2FpdEZvclBvcG92ZXJUb0Rpc21pc3MoKQogICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLmlz
V2ViS2l0MigpIHx8ICF0aGlzLmlzSU9TKCkpCisgICAgICAgIGlmICghdGhpcy5pc1dlYktpdDIo
KSB8fCAhdGhpcy5pc0lPU0ZhbWlseSgpKQogICAgICAgICAgICAgcmV0dXJuIFByb21pc2UucmVz
b2x2ZSgpOwogCiAgICAgICAgIHJldHVybiBuZXcgUHJvbWlzZShyZXNvbHZlID0+IHsKQEAgLTQx
Niw3ICs0MTYsNyBAQCB3aW5kb3cuVUlIZWxwZXIgPSBjbGFzcyBVSUhlbHBlciB7CiAKICAgICBz
dGF0aWMgd2FpdEZvcktleWJvYXJkVG9IaWRlKCkKICAgICB7Ci0gICAgICAgIGlmICghdGhpcy5p
c1dlYktpdDIoKSB8fCAhdGhpcy5pc0lPUygpKQorICAgICAgICBpZiAoIXRoaXMuaXNXZWJLaXQy
KCkgfHwgIXRoaXMuaXNJT1NGYW1pbHkoKSkKICAgICAgICAgICAgIHJldHVybiBQcm9taXNlLnJl
c29sdmUoKTsKIAogICAgICAgICByZXR1cm4gbmV3IFByb21pc2UocmVzb2x2ZSA9PiB7CkBAIC00
MzIsNyArNDMyLDcgQEAgd2luZG93LlVJSGVscGVyID0gY2xhc3MgVUlIZWxwZXIgewogCiAgICAg
c3RhdGljIGdldFVJQ2FyZXRSZWN0KCkKICAgICB7Ci0gICAgICAgIGlmICghdGhpcy5pc1dlYktp
dDIoKSB8fCAhdGhpcy5pc0lPUygpKQorICAgICAgICBpZiAoIXRoaXMuaXNXZWJLaXQyKCkgfHwg
IXRoaXMuaXNJT1NGYW1pbHkoKSkKICAgICAgICAgICAgIHJldHVybiBQcm9taXNlLnJlc29sdmUo
KTsKIAogICAgICAgICByZXR1cm4gbmV3IFByb21pc2UocmVzb2x2ZSA9PiB7CkBAIC00NDgsNyAr
NDQ4LDcgQEAgd2luZG93LlVJSGVscGVyID0gY2xhc3MgVUlIZWxwZXIgewogCiAgICAgc3RhdGlj
IGdldFVJU2VsZWN0aW9uUmVjdHMoKQogICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLmlzV2ViS2l0
MigpIHx8ICF0aGlzLmlzSU9TKCkpCisgICAgICAgIGlmICghdGhpcy5pc1dlYktpdDIoKSB8fCAh
dGhpcy5pc0lPU0ZhbWlseSgpKQogICAgICAgICAgICAgcmV0dXJuIFByb21pc2UucmVzb2x2ZSgp
OwogCiAgICAgICAgIHJldHVybiBuZXcgUHJvbWlzZShyZXNvbHZlID0+IHsKQEAgLTQ2NCw3ICs0
NjQsNyBAQCB3aW5kb3cuVUlIZWxwZXIgPSBjbGFzcyBVSUhlbHBlciB7CiAKICAgICBzdGF0aWMg
Z2V0VUlDYXJldFZpZXdSZWN0KCkKICAgICB7Ci0gICAgICAgIGlmICghdGhpcy5pc1dlYktpdDIo
KSB8fCAhdGhpcy5pc0lPUygpKQorICAgICAgICBpZiAoIXRoaXMuaXNXZWJLaXQyKCkgfHwgIXRo
aXMuaXNJT1NGYW1pbHkoKSkKICAgICAgICAgICAgIHJldHVybiBQcm9taXNlLnJlc29sdmUoKTsK
IAogICAgICAgICByZXR1cm4gbmV3IFByb21pc2UocmVzb2x2ZSA9PiB7CkBAIC00ODAsNyArNDgw
LDcgQEAgd2luZG93LlVJSGVscGVyID0gY2xhc3MgVUlIZWxwZXIgewogCiAgICAgc3RhdGljIGdl
dFVJU2VsZWN0aW9uVmlld1JlY3RzKCkKICAgICB7Ci0gICAgICAgIGlmICghdGhpcy5pc1dlYktp
dDIoKSB8fCAhdGhpcy5pc0lPUygpKQorICAgICAgICBpZiAoIXRoaXMuaXNXZWJLaXQyKCkgfHwg
IXRoaXMuaXNJT1NGYW1pbHkoKSkKICAgICAgICAgICAgIHJldHVybiBQcm9taXNlLnJlc29sdmUo
KTsKIAogICAgICAgICByZXR1cm4gbmV3IFByb21pc2UocmVzb2x2ZSA9PiB7CkBAIC00OTYsNyAr
NDk2LDcgQEAgd2luZG93LlVJSGVscGVyID0gY2xhc3MgVUlIZWxwZXIgewogCiAgICAgc3RhdGlj
IGdldFNlbGVjdGlvblN0YXJ0R3JhYmJlclZpZXdSZWN0KCkKICAgICB7Ci0gICAgICAgIGlmICgh
dGhpcy5pc1dlYktpdDIoKSB8fCAhdGhpcy5pc0lPUygpKQorICAgICAgICBpZiAoIXRoaXMuaXNX
ZWJLaXQyKCkgfHwgIXRoaXMuaXNJT1NGYW1pbHkoKSkKICAgICAgICAgICAgIHJldHVybiBQcm9t
aXNlLnJlc29sdmUoKTsKIAogICAgICAgICByZXR1cm4gbmV3IFByb21pc2UocmVzb2x2ZSA9PiB7
CkBAIC01MTIsNyArNTEyLDcgQEAgd2luZG93LlVJSGVscGVyID0gY2xhc3MgVUlIZWxwZXIgewog
CiAgICAgc3RhdGljIGdldFNlbGVjdGlvbkVuZEdyYWJiZXJWaWV3UmVjdCgpCiAgICAgewotICAg
ICAgICBpZiAoIXRoaXMuaXNXZWJLaXQyKCkgfHwgIXRoaXMuaXNJT1MoKSkKKyAgICAgICAgaWYg
KCF0aGlzLmlzV2ViS2l0MigpIHx8ICF0aGlzLmlzSU9TRmFtaWx5KCkpCiAgICAgICAgICAgICBy
ZXR1cm4gUHJvbWlzZS5yZXNvbHZlKCk7CiAKICAgICAgICAgcmV0dXJuIG5ldyBQcm9taXNlKHJl
c29sdmUgPT4gewpAQCAtNjM0LDcgKzYzNCw3IEBAIHdpbmRvdy5VSUhlbHBlciA9IGNsYXNzIFVJ
SGVscGVyIHsKIAogICAgIHN0YXRpYyB0eXBlQ2hhcmFjdGVyKGNoYXJhY3RlclN0cmluZykKICAg
ICB7Ci0gICAgICAgIGlmICghdGhpcy5pc1dlYktpdDIoKSB8fCAhdGhpcy5pc0lPUygpKSB7Cisg
ICAgICAgIGlmICghdGhpcy5pc1dlYktpdDIoKSB8fCAhdGhpcy5pc0lPU0ZhbWlseSgpKSB7CiAg
ICAgICAgICAgICBldmVudFNlbmRlci5rZXlEb3duKGNoYXJhY3RlclN0cmluZyk7CiAgICAgICAg
ICAgICByZXR1cm47CiAgICAgICAgIH0KQEAgLTY1Niw3ICs2NTYsNyBAQCB3aW5kb3cuVUlIZWxw
ZXIgPSBjbGFzcyBVSUhlbHBlciB7CiAKICAgICBzdGF0aWMgaW5wdXRWaWV3Qm91bmRzKCkKICAg
ICB7Ci0gICAgICAgIGlmICghdGhpcy5pc1dlYktpdDIoKSB8fCAhdGhpcy5pc0lPUygpKQorICAg
ICAgICBpZiAoIXRoaXMuaXNXZWJLaXQyKCkgfHwgIXRoaXMuaXNJT1NGYW1pbHkoKSkKICAgICAg
ICAgICAgIHJldHVybiBQcm9taXNlLnJlc29sdmUoKTsKIAogICAgICAgICByZXR1cm4gbmV3IFBy
b21pc2UocmVzb2x2ZSA9PiB7CkBAIC03OTUsNyArNzk1LDcgQEAgd2luZG93LlVJSGVscGVyID0g
Y2xhc3MgVUlIZWxwZXIgewogCiAgICAgc3RhdGljIGNvbnRlbnRPZmZzZXQoKQogICAgIHsKLSAg
ICAgICAgaWYgKCF0aGlzLmlzSU9TKCkpCisgICAgICAgIGlmICghdGhpcy5pc0lPU0ZhbWlseSgp
KQogICAgICAgICAgICAgcmV0dXJuIFByb21pc2UucmVzb2x2ZSgpOwogCiAgICAgICAgIGNvbnN0
IHVpU2NyaXB0ID0gIkpTT04uc3RyaW5naWZ5KFt1aUNvbnRyb2xsZXIuY29udGVudE9mZnNldFgs
IHVpQ29udHJvbGxlci5jb250ZW50T2Zmc2V0WV0pIjsKQEAgLTkwOSw3ICs5MDksNyBAQCB3aW5k
b3cuVUlIZWxwZXIgPSBjbGFzcyBVSUhlbHBlciB7CiAKICAgICBzdGF0aWMgcm90YXRlRGV2aWNl
KG9yaWVudGF0aW9uTmFtZSwgYW5pbWF0ZWRSZXNpemUgPSBmYWxzZSkKICAgICB7Ci0gICAgICAg
IGlmICghdGhpcy5pc1dlYktpdDIoKSB8fCAhdGhpcy5pc0lPUygpKQorICAgICAgICBpZiAoIXRo
aXMuaXNXZWJLaXQyKCkgfHwgIXRoaXMuaXNJT1NGYW1pbHkoKSkKICAgICAgICAgICAgIHJldHVy
biBQcm9taXNlLnJlc29sdmUoKTsKIAogICAgICAgICByZXR1cm4gbmV3IFByb21pc2UocmVzb2x2
ZSA9PiB7Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>