<?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>231896</bug_id>
          
          <creation_ts>2021-10-18 08:53:48 -0700</creation_ts>
          <short_desc>Web Inspector: Remove Source/WebInspectorUI/UserInterface/Controllers/WebInspectorExtensionController.js.orig</short_desc>
          <delta_ts>2021-10-18 18:44:18 -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>Web Inspector</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>All</rep_platform>
          <op_sys>All</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="David Kilzer (:ddkilzer)">ddkilzer</reporter>
          <assigned_to name="David Kilzer (:ddkilzer)">ddkilzer</assigned_to>
          <cc>bburg</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>hi</cc>
    
    <cc>inspector-bugzilla-changes</cc>
    
    <cc>pangle</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1805593</commentid>
    <comment_count>0</comment_count>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-10-18 08:53:48 -0700</bug_when>
    <thetext>Source/WebInspectorUI/UserInterface/Controllers/WebInspectorExtensionController.js.orig was committed in r283857 and modified in r283859, but still has some differences from WebInspectorExtensionController.js.

It seems like it could be removed, but someone with knowledge of this source should check to see that it&apos;s okay to remove it without any further changes to WebInspectorExtensionController.js.

Found while running `find Source -name \*.orig` to look for local backup files left by patch(1) command.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1805594</commentid>
    <comment_count>1</comment_count>
      <attachid>441609</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-10-18 08:54:42 -0700</bug_when>
    <thetext>Created attachment 441609
Differences between files (do not commit)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1805595</commentid>
    <comment_count>2</comment_count>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-10-18 08:55:17 -0700</bug_when>
    <thetext>(In reply to David Kilzer (:ddkilzer) from comment #1)
&gt; Created attachment 441609 [details]
&gt; Differences between files (do not commit)

$ diff -u Source/WebInspectorUI/UserInterface/Controllers/WebInspectorExtensionController.js Source/WebInspectorUI/UserInterface/Controllers/WebInspectorExtensionController.js.orig &gt; bug-231896-WebInspectorExtensionController.js.orig.diff</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1805596</commentid>
    <comment_count>3</comment_count>
      <attachid>441610</attachid>
    <who name="David Kilzer (:ddkilzer)">ddkilzer</who>
    <bug_when>2021-10-18 08:56:49 -0700</bug_when>
    <thetext>Created attachment 441610
Patch v1</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1805823</commentid>
    <comment_count>4</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-10-18 18:43:09 -0700</bug_when>
    <thetext>Committed r284422 (243190@main): &lt;https://commits.webkit.org/243190@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 441610.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1805824</commentid>
    <comment_count>5</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-10-18 18:44:18 -0700</bug_when>
    <thetext>&lt;rdar://problem/84397260&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>441609</attachid>
            <date>2021-10-18 08:54:42 -0700</date>
            <delta_ts>2021-10-18 08:57:07 -0700</delta_ts>
            <desc>Differences between files (do not commit)</desc>
            <filename>bug-231896-WebInspectorExtensionController.js.orig.diff</filename>
            <type>text/plain</type>
            <size>5855</size>
            <attacher name="David Kilzer (:ddkilzer)">ddkilzer</attacher>
            
              <data encoding="base64">LS0tIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1dlYklu
c3BlY3RvckV4dGVuc2lvbkNvbnRyb2xsZXIuanMJMjAyMS0xMC0xNyAxMzoyNzo1OC4wMDAwMDAw
MDAgLTA3MDAKKysrIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xs
ZXJzL1dlYkluc3BlY3RvckV4dGVuc2lvbkNvbnRyb2xsZXIuanMub3JpZwkyMDIxLTEwLTE4IDA4
OjQ4OjM5LjAwMDAwMDAwMCAtMDcwMApAQCAtNjgsNyArNjgsNyBAQAogICAgICAgICBsZXQgZXh0
ZW5zaW9uVGFiSURzVG9SZW1vdmUgPSB0aGlzLl90YWJJRHNGb3JFeHRlbnNpb25JRE1hcC50YWtl
KGV4dGVuc2lvbklEKSB8fCBbXTsKICAgICAgICAgZm9yIChsZXQgZXh0ZW5zaW9uVGFiSUQgb2Yg
ZXh0ZW5zaW9uVGFiSURzVG9SZW1vdmUpIHsKICAgICAgICAgICAgIGxldCB0YWJDb250ZW50Vmll
dyA9IHRoaXMuX2V4dGVuc2lvblRhYkNvbnRlbnRWaWV3Rm9yRXh0ZW5zaW9uVGFiSURNYXAudGFr
ZShleHRlbnNpb25UYWJJRCk7Ci0gICAgICAgICAgICBXSS50YWJCcm93c2VyLmNsb3NlVGFiRm9y
Q29udGVudFZpZXcodGFiQ29udGVudFZpZXcsIHtzdXBwcmVzc0FuaW1hdGlvbnM6IHRydWV9KTsK
KyAgICAgICAgICAgIFdJLnRhYkJyb3dzZXIuY2xvc2VUYWJGb3JDb250ZW50Vmlldyh0YWJDb250
ZW50Vmlldyk7CiAgICAgICAgIH0KIAogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3Rl
bmVycyhXSS5XZWJJbnNwZWN0b3JFeHRlbnNpb25Db250cm9sbGVyLkV2ZW50LkV4dGVuc2lvblJl
bW92ZWQsIHtleHRlbnNpb259KTsKQEAgLTg3LDcgKzg3LDcgQEAKIAogICAgICAgICB0aGlzLl90
YWJJRHNGb3JFeHRlbnNpb25JRE1hcC5hZGQoZXh0ZW5zaW9uSUQsIGV4dGVuc2lvblRhYklEKTsK
ICAgICAgICAgdGhpcy5fZXh0ZW5zaW9uVGFiQ29udGVudFZpZXdGb3JFeHRlbnNpb25UYWJJRE1h
cC5zZXQoZXh0ZW5zaW9uVGFiSUQsIHRhYkNvbnRlbnRWaWV3KTsKLSAgICAgICAgV0kudGFiQnJv
d3Nlci5hZGRUYWJGb3JDb250ZW50Vmlldyh0YWJDb250ZW50Vmlldywge3N1cHByZXNzQW5pbWF0
aW9uczogdHJ1ZX0pOworICAgICAgICBXSS50YWJCcm93c2VyLmFkZFRhYkZvckNvbnRlbnRWaWV3
KHRhYkNvbnRlbnRWaWV3KTsKIAogICAgICAgICAvLyBUaGUgY2FsbGluZyBjb252ZW50aW9uIGlz
IHRvIHJldHVybiBhbiBlcnJvciBzdHJpbmcgb3IgYSByZXN1bHQgb2JqZWN0LgogICAgICAgICBy
ZXR1cm4ge2V4dGVuc2lvblRhYklEfTsKQEAgLTE2MCw3ICsxNjAsNyBAQAogICAgICAgICByZXR1
cm4gdGFyZ2V0LlBhZ2VBZ2VudC5yZWxvYWQuaW52b2tlKHtpZ25vcmVDYWNoZX0pOwogICAgIH0K
ICAgICAKLSAgICBzaG93RXh0ZW5zaW9uVGFiKGV4dGVuc2lvblRhYklELCBvcHRpb25zID0ge30p
CisgICAgc2hvd0V4dGVuc2lvblRhYihleHRlbnNpb25UYWJJRCkKICAgICB7CiAgICAgICAgIGxl
dCB0YWJDb250ZW50VmlldyA9IHRoaXMuX2V4dGVuc2lvblRhYkNvbnRlbnRWaWV3Rm9yRXh0ZW5z
aW9uVGFiSURNYXAuZ2V0KGV4dGVuc2lvblRhYklEKTsKICAgICAgICAgaWYgKCF0YWJDb250ZW50
VmlldykgewpAQCAtMTY4LDkgKzE2OCw3IEBACiAgICAgICAgICAgICByZXR1cm4gV0kuV2ViSW5z
cGVjdG9yRXh0ZW5zaW9uLkVycm9yQ29kZS5JbnZhbGlkUmVxdWVzdDsKICAgICAgICAgfQogCi0g
ICAgICAgIHRhYkNvbnRlbnRWaWV3LnZpc2libGUgPSB0cnVlOwogICAgICAgICBsZXQgc3VjY2Vz
cyA9IFdJLnRhYkJyb3dzZXIuc2hvd1RhYkZvckNvbnRlbnRWaWV3KHRhYkNvbnRlbnRWaWV3LCB7
Ci0gICAgICAgICAgICAuLi5vcHRpb25zLAogICAgICAgICAgICAgaW5pdGlhdG9ySGludDogV0ku
VGFiQnJvd3Nlci5UYWJOYXZpZ2F0aW9uSW5pdGlhdG9yLkZyb250ZW5kQVBJLAogICAgICAgICB9
KTsKIApAQCAtMTc4LDU1ICsxNzYsNiBAQAogICAgICAgICAgICAgV0kucmVwb3J0SW50ZXJuYWxF
cnJvcigiVW5hYmxlIHRvIHNob3cgZXh0ZW5zaW9uIHRhYiB3aXRoIGV4dGVuc2lvblRhYklEOiAi
ICsgZXh0ZW5zaW9uVGFiSUQpOwogICAgICAgICAgICAgcmV0dXJuIFdJLldlYkluc3BlY3RvckV4
dGVuc2lvbi5FcnJvckNvZGUuSW50ZXJuYWxFcnJvcjsKICAgICAgICAgfQotCi0gICAgICAgIHRh
YkNvbnRlbnRWaWV3LnZpc2libGUgPSB0cnVlOwotICAgIH0KLQotICAgIGhpZGVFeHRlbnNpb25U
YWIoZXh0ZW5zaW9uVGFiSUQsIG9wdGlvbnMgPSB7fSkKLSAgICB7Ci0gICAgICAgIGxldCB0YWJD
b250ZW50VmlldyA9IHRoaXMuX2V4dGVuc2lvblRhYkNvbnRlbnRWaWV3Rm9yRXh0ZW5zaW9uVGFi
SURNYXAuZ2V0KGV4dGVuc2lvblRhYklEKTsKLSAgICAgICAgaWYgKCF0YWJDb250ZW50Vmlldykg
ewotICAgICAgICAgICAgV0kucmVwb3J0SW50ZXJuYWxFcnJvcigiVW5hYmxlIHRvIHNob3cgZXh0
ZW5zaW9uIHRhYiB3aXRoIHVua25vd24gZXh0ZW5zaW9uVGFiSUQ6ICIgKyBleHRlbnNpb25UYWJJ
RCk7Ci0gICAgICAgICAgICByZXR1cm4gV0kuV2ViSW5zcGVjdG9yRXh0ZW5zaW9uLkVycm9yQ29k
ZS5JbnZhbGlkUmVxdWVzdDsKLSAgICAgICAgfQotCi0gICAgICAgIHRhYkNvbnRlbnRWaWV3LnZp
c2libGUgPSBmYWxzZTsKLSAgICAgICAgV0kudGFiQnJvd3Nlci5jbG9zZVRhYkZvckNvbnRlbnRW
aWV3KHRhYkNvbnRlbnRWaWV3LCBvcHRpb25zKTsKLQotICAgICAgICBjb25zb2xlLmFzc2VydCgh
dGFiQ29udGVudFZpZXcudmlzaWJsZSk7Ci0gICAgICAgIGNvbnNvbGUuYXNzZXJ0KCF0YWJDb250
ZW50Vmlldy5pc0Nsb3NlZCk7Ci0gICAgfQotCi0gICAgYWRkQ29udGV4dE1lbnVJdGVtc0ZvckNs
b3NlZEV4dGVuc2lvblRhYnMoY29udGV4dE1lbnUpCi0gICAgewotICAgICAgICBjb250ZXh0TWVu
dS5hcHBlbmRTZXBhcmF0b3IoKTsKLQotICAgICAgICBmb3IgKGxldCB0YWJDb250ZW50VmlldyBv
ZiB0aGlzLl9leHRlbnNpb25UYWJDb250ZW50Vmlld0ZvckV4dGVuc2lvblRhYklETWFwLnZhbHVl
cygpKSB7Ci0gICAgICAgICAgICAvLyBJZiB0aGUgZXh0ZW5zaW9uIHRhYiBoYXMgYmVlbiB1bmNo
ZWNrZWQgaW4gdGhlIFRhYkJhciBjb250ZXh0IG1lbnUsIHRoZW4gdGhlIHRhYkJhckl0ZW0KLSAg
ICAgICAgICAgIC8vIGZvciB0aGUgZXh0ZW5zaW9uIHRhYiB3aWxsIG5vdCBiZSBjb25uZWN0ZWQg
dG8gYSBwYXJlbnQgVGFiQmFyLgotICAgICAgICAgICAgbGV0IHNob3VsZEluY2x1ZGVUYWIgPSAh
dGFiQ29udGVudFZpZXcudmlzaWJsZSB8fCAhdGFiQ29udGVudFZpZXcudGFiQmFySXRlbS5wYXJl
bnRUYWJCYXI7Ci0gICAgICAgICAgICBpZiAoIXNob3VsZEluY2x1ZGVUYWIpCi0gICAgICAgICAg
ICAgICAgY29udGludWU7Ci0KLSAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0odGFi
Q29udGVudFZpZXcudGFiSW5mbygpLmRpc3BsYXlOYW1lLCAoKSA9PiB7Ci0gICAgICAgICAgICAg
ICAgdGhpcy5zaG93RXh0ZW5zaW9uVGFiKHRhYkNvbnRlbnRWaWV3LmV4dGVuc2lvblRhYklEKTsK
LSAgICAgICAgICAgIH0pOwotICAgICAgICB9Ci0gICAgfQotCi0gICAgYWRkQ29udGV4dE1lbnVJ
dGVtc0ZvckFsbEV4dGVuc2lvblRhYnMoY29udGV4dE1lbnUpCi0gICAgewotICAgICAgICBjb250
ZXh0TWVudS5hcHBlbmRTZXBhcmF0b3IoKTsKLQotICAgICAgICBmb3IgKGxldCB0YWJDb250ZW50
VmlldyBvZiB0aGlzLl9leHRlbnNpb25UYWJDb250ZW50Vmlld0ZvckV4dGVuc2lvblRhYklETWFw
LnZhbHVlcygpKSB7Ci0gICAgICAgICAgICBsZXQgY2hlY2tlZCA9IHRhYkNvbnRlbnRWaWV3LnZp
c2libGUgfHwgISF0YWJDb250ZW50Vmlldy50YWJCYXJJdGVtLnBhcmVudFRhYkJhcjsKLSAgICAg
ICAgICAgIGNvbnRleHRNZW51LmFwcGVuZENoZWNrYm94SXRlbSh0YWJDb250ZW50Vmlldy50YWJJ
bmZvKCkuZGlzcGxheU5hbWUsICgpID0+IHsKLSAgICAgICAgICAgICAgICBpZiAoIWNoZWNrZWQp
Ci0gICAgICAgICAgICAgICAgICAgIHRoaXMuc2hvd0V4dGVuc2lvblRhYih0YWJDb250ZW50Vmll
dy5leHRlbnNpb25UYWJJRCk7Ci0gICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAg
ICAgICB0aGlzLmhpZGVFeHRlbnNpb25UYWIodGFiQ29udGVudFZpZXcuZXh0ZW5zaW9uVGFiSUQp
OwotICAgICAgICAgICAgfSwgY2hlY2tlZCk7Ci0gICAgICAgIH0KICAgICB9CiAKICAgICBldmFs
dWF0ZVNjcmlwdEluRXh0ZW5zaW9uVGFiKGV4dGVuc2lvblRhYklELCBzY3JpcHRTb3VyY2UpCkBA
IC0yNDMsMzEgKzE5MiwxMSBAQAogICAgICAgICAgICAgcmV0dXJuIFdJLldlYkluc3BlY3RvckV4
dGVuc2lvbi5FcnJvckNvZGUuSW52YWxpZFJlcXVlc3Q7CiAgICAgICAgIH0KIAotICAgICAgICBy
ZXR1cm4gbmV3IFByb21pc2UoKHJlc29sdmUsIHJlamVjdCkgPT4gewotICAgICAgICAgICAgdHJ5
IHsKLSAgICAgICAgICAgICAgICAvLyBJZiBgcmVzdWx0YCBpcyBhIHByb21pc2UsIHRoZW4gaXQg
Y2FtZSBmcm9tIGEgZGlmZmVyZW50IGZyYW1lIGFuZCBgaW5zdGFuY2VvZiBQcm9taXNlYCB3b24n
dCB3b3JrLgotICAgICAgICAgICAgICAgIGxldCByZXN1bHQgPSBJbnNwZWN0b3JGcm9udGVuZEhv
c3QuZXZhbHVhdGVTY3JpcHRJbkV4dGVuc2lvblRhYihpZnJhbWUsIHNjcmlwdFNvdXJjZSk7Ci0g
ICAgICAgICAgICAgICAgaWYgKHJlc3VsdD8udGhlbikgewotICAgICAgICAgICAgICAgICAgICBy
ZXN1bHQudGhlbigocmVzb2x2ZWRWYWx1ZSkgPT4gcmVzb2x2ZSh7cmVzdWx0OiByZXNvbHZlZFZh
bHVlfSksIChlcnJvclZhbHVlKSA9PiByZWplY3Qoe2Vycm9yOiBlcnJvclZhbHVlfSkpOwotICAg
ICAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICAgICAgfQotCi0gICAgICAgICAg
ICAgICAgcmVzb2x2ZSh7cmVzdWx0fSk7Ci0gICAgICAgICAgICB9IGNhdGNoIChlcnJvcikgewot
ICAgICAgICAgICAgICAgIC8vIEluY2x1ZGUgbW9yZSBjb250ZXh0IGluIHRoZSBzdHJpbmdpZmlj
YXRpb24gb2YgdGhlIGVycm9yLgotICAgICAgICAgICAgICAgIGNvbnN0IHN0YWNrSW5kZW50ID0g
IiAgIjsKLSAgICAgICAgICAgICAgICBsZXQgc3RhY2tMaW5lcyA9IChlcnJvci5zdGFjaz8uc3Bs
aXQoIlxuIikgfHwgW10pLm1hcCgobGluZSkgPT4gYCR7c3RhY2tJbmRlbnR9JHtsaW5lfWApOwot
ICAgICAgICAgICAgICAgIGxldCBmb3JtYXR0ZWRNZXNzYWdlID0gWwotICAgICAgICAgICAgICAg
ICAgICBgQ2F1Z2h0IEV4Y2VwdGlvbjogJHtlcnJvci5uYW1lfWAsCi0gICAgICAgICAgICAgICAg
ICAgIGBhdCAke2Vycm9yLnNvdXJjZVVSTCB8fCAiKHVua25vd24pIn06JHtlcnJvci5saW5lIHx8
IDB9OiR7ZXJyb3IuY29sdW1uIHx8IDB9OmAsCi0gICAgICAgICAgICAgICAgICAgIGVycm9yLm1l
c3NhZ2UsCi0gICAgICAgICAgICAgICAgICAgICIiLAotICAgICAgICAgICAgICAgICAgICAiQmFj
a3RyYWNlOiIsCi0gICAgICAgICAgICAgICAgICAgIC4uLnN0YWNrTGluZXMsCi0gICAgICAgICAg
ICAgICAgXS5qb2luKCJcbiIpOwotICAgICAgICAgICAgICAgIHJlamVjdCh7ZXJyb3I6IGZvcm1h
dHRlZE1lc3NhZ2V9KTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfSk7CisgICAgICAgIHRyeSB7
CisgICAgICAgICAgICByZXR1cm4ge3Jlc3VsdDogSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmV2YWx1
YXRlU2NyaXB0SW5FeHRlbnNpb25UYWIoaWZyYW1lLCBzY3JpcHRTb3VyY2UpfTsKKyAgICAgICAg
fSBjYXRjaCAoZXJyb3IpIHsKKyAgICAgICAgICAgIHJldHVybiB7ZXJyb3I6IGVycm9yLm1lc3Nh
Z2V9OworICAgICAgICB9CiAgICAgfQogCiAgICAgLy8gUHJpdmF0ZQo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>441610</attachid>
            <date>2021-10-18 08:56:49 -0700</date>
            <delta_ts>2021-10-18 18:43:10 -0700</delta_ts>
            <desc>Patch v1</desc>
            <filename>bug-231896-20211018085649.patch</filename>
            <type>text/plain</type>
            <size>11032</size>
            <attacher name="David Kilzer (:ddkilzer)">ddkilzer</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0MzczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj
dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA0
MTQ0NjQxYzQyY2QzMjZhZmI2ZDk1MTk3Mzk1OGFlZDg3ZTJmZDRjLi4zZTQ3M2I0MDYyNGRhM2Fj
ZTgxYzRjNWJhZWVhMTU3OTRkMTdiOWZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y
VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs
MyArMSwxMiBAQAorMjAyMS0xMC0xOCAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29t
PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlbW92ZSBTb3VyY2UvV2ViSW5zcGVjdG9yVUkv
VXNlckludGVyZmFjZS9Db250cm9sbGVycy9XZWJJbnNwZWN0b3JFeHRlbnNpb25Db250cm9sbGVy
LmpzLm9yaWcKKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzIzMTg5Nj4KKworICAgICAg
ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv
Q29udHJvbGxlcnMvV2ViSW5zcGVjdG9yRXh0ZW5zaW9uQ29udHJvbGxlci5qcy5vcmlnOiBSZW1v
dmUuCisKIDIwMjEtMTAtMTUgIEJKIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAg
W0NvY29hXSBXZWIgSW5zcGVjdG9yOiBoYW5kbGUgUHJvbWlzZSBvYmplY3RzIHJldHVybmVkIGZy
b20gZXZhbHVhdGVTY3JpcHRJbkV4dGVuc2lvblRhYgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu
c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvV2ViSW5zcGVjdG9yRXh0ZW5zaW9u
Q29udHJvbGxlci5qcy5vcmlnIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv
Q29udHJvbGxlcnMvV2ViSW5zcGVjdG9yRXh0ZW5zaW9uQ29udHJvbGxlci5qcy5vcmlnCmRlbGV0
ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBhZjA5YjM2ZWI3NjNjY2Q2MTJlM2ZmZGFiNmRkZTk4
YWNiYzRlZTFmLi4wMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCi0tLSBh
L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1dlYkluc3Bl
Y3RvckV4dGVuc2lvbkNvbnRyb2xsZXIuanMub3JpZworKysgL2Rldi9udWxsCkBAIC0xLDIyMCAr
MCwwIEBACi0vKgotICogQ29weXJpZ2h0IChDKSAyMDIwLTIwMjEgQXBwbGUgSW5jLiBBbGwgcmln
aHRzIHJlc2VydmVkLgotICoKLSAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFu
ZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAotICogbW9kaWZpY2F0aW9uLCBhcmUgcGVy
bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCi0gKiBhcmUgbWV0
OgotICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBh
Ym92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k
IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KLSAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5h
cnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAgICBub3RpY2Us
IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4g
dGhlCi0gKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQg
d2l0aCB0aGUgZGlzdHJpYnV0aW9uLgotICoKLSAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQg
QlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKLSAqIEFORCBBTlkg
RVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVE
IFRPLAotICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJ
VE5FU1MgRk9SIEEgUEFSVElDVUxBUgotICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8g
RVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCi0gKiBCRSBMSUFCTEUg
Rk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlks
IE9SCi0gKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVE
IFRPLCBQUk9DVVJFTUVOVCBPRgotICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9T
UyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCi0gKiBJTlRFUlJVUFRJT04p
IEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJ
TgotICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdM
SUdFTkNFIE9SIE9USEVSV0lTRSkKLSAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVT
RSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKLSAqIFRIRSBQT1NTSUJJTElU
WSBPRiBTVUNIIERBTUFHRS4KLSAqLwotCi1XSS5XZWJJbnNwZWN0b3JFeHRlbnNpb25Db250cm9s
bGVyID0gY2xhc3MgV2ViSW5zcGVjdG9yRXh0ZW5zaW9uQ29udHJvbGxlciBleHRlbmRzIFdJLk9i
amVjdAotewotICAgIGNvbnN0cnVjdG9yKCkKLSAgICB7Ci0gICAgICAgIHN1cGVyKCk7Ci0KLSAg
ICAgICAgdGhpcy5fZXh0ZW5zaW9uRm9yRXh0ZW5zaW9uSURNYXAgPSBuZXcgTWFwOwotICAgICAg
ICB0aGlzLl9leHRlbnNpb25UYWJDb250ZW50Vmlld0ZvckV4dGVuc2lvblRhYklETWFwID0gbmV3
IE1hcDsKLSAgICAgICAgdGhpcy5fdGFiSURzRm9yRXh0ZW5zaW9uSURNYXAgPSBuZXcgTXVsdGlt
YXA7Ci0gICAgICAgIHRoaXMuX25leHRFeHRlbnNpb25UYWJJRCA9IDE7Ci0KLSAgICAgICAgV0ku
RnJhbWUuYWRkRXZlbnRMaXN0ZW5lcihXSS5GcmFtZS5FdmVudC5NYWluUmVzb3VyY2VEaWRDaGFu
Z2UsIHRoaXMuX2hhbmRsZU1haW5SZXNvdXJjZURpZENoYW5nZSwgdGhpcyk7Ci0gICAgfQotCi0g
ICAgLy8gUHVibGljCi0KLSAgICBnZXQgcmVnaXN0ZXJlZEV4dGVuc2lvbklEcygpCi0gICAgewot
ICAgICAgICByZXR1cm4gbmV3IFNldCh0aGlzLl9leHRlbnNpb25Gb3JFeHRlbnNpb25JRE1hcC5r
ZXlzKCkpOwotICAgIH0KLQotICAgIHJlZ2lzdGVyRXh0ZW5zaW9uKGV4dGVuc2lvbklELCBkaXNw
bGF5TmFtZSkKLSAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9leHRlbnNpb25Gb3JFeHRlbnNpb25J
RE1hcC5oYXMoZXh0ZW5zaW9uSUQpKSB7Ci0gICAgICAgICAgICBXSS5yZXBvcnRJbnRlcm5hbEVy
cm9yKCJVbmFibGUgdG8gcmVnaXN0ZXIgZXh0ZW5zaW9uLCBpdCdzIGFscmVhZHkgcmVnaXN0ZXJl
ZDogIiArIGV4dGVuc2lvbklEKTsKLSAgICAgICAgICAgIHJldHVybiBXSS5XZWJJbnNwZWN0b3JF
eHRlbnNpb24uRXJyb3JDb2RlLlJlZ2lzdHJhdGlvbkZhaWxlZDsKLSAgICAgICAgfQotCi0gICAg
ICAgIGxldCBleHRlbnNpb24gPSBuZXcgV0kuV2ViSW5zcGVjdG9yRXh0ZW5zaW9uKGV4dGVuc2lv
bklELCBkaXNwbGF5TmFtZSk7Ci0gICAgICAgIHRoaXMuX2V4dGVuc2lvbkZvckV4dGVuc2lvbklE
TWFwLnNldChleHRlbnNpb25JRCwgZXh0ZW5zaW9uKTsKLQotICAgICAgICB0aGlzLmRpc3BhdGNo
RXZlbnRUb0xpc3RlbmVycyhXSS5XZWJJbnNwZWN0b3JFeHRlbnNpb25Db250cm9sbGVyLkV2ZW50
LkV4dGVuc2lvbkFkZGVkLCB7ZXh0ZW5zaW9ufSk7Ci0gICAgfQotCi0gICAgdW5yZWdpc3RlckV4
dGVuc2lvbihleHRlbnNpb25JRCkKLSAgICB7Ci0gICAgICAgIGxldCBleHRlbnNpb24gPSB0aGlz
Ll9leHRlbnNpb25Gb3JFeHRlbnNpb25JRE1hcC50YWtlKGV4dGVuc2lvbklEKTsKLSAgICAgICAg
aWYgKCFleHRlbnNpb24pIHsKLSAgICAgICAgICAgIFdJLnJlcG9ydEludGVybmFsRXJyb3IoIlVu
YWJsZSB0byB1bnJlZ2lzdGVyIGV4dGVuc2lvbiB3aXRoIHVua25vd24gSUQ6ICIgKyBleHRlbnNp
b25JRCk7Ci0gICAgICAgICAgICByZXR1cm4gV0kuV2ViSW5zcGVjdG9yRXh0ZW5zaW9uLkVycm9y
Q29kZS5JbnZhbGlkUmVxdWVzdDsKLSAgICAgICAgfQotCi0gICAgICAgIGxldCBleHRlbnNpb25U
YWJJRHNUb1JlbW92ZSA9IHRoaXMuX3RhYklEc0ZvckV4dGVuc2lvbklETWFwLnRha2UoZXh0ZW5z
aW9uSUQpIHx8IFtdOwotICAgICAgICBmb3IgKGxldCBleHRlbnNpb25UYWJJRCBvZiBleHRlbnNp
b25UYWJJRHNUb1JlbW92ZSkgewotICAgICAgICAgICAgbGV0IHRhYkNvbnRlbnRWaWV3ID0gdGhp
cy5fZXh0ZW5zaW9uVGFiQ29udGVudFZpZXdGb3JFeHRlbnNpb25UYWJJRE1hcC50YWtlKGV4dGVu
c2lvblRhYklEKTsKLSAgICAgICAgICAgIFdJLnRhYkJyb3dzZXIuY2xvc2VUYWJGb3JDb250ZW50
Vmlldyh0YWJDb250ZW50Vmlldyk7Ci0gICAgICAgIH0KLQotICAgICAgICB0aGlzLmRpc3BhdGNo
RXZlbnRUb0xpc3RlbmVycyhXSS5XZWJJbnNwZWN0b3JFeHRlbnNpb25Db250cm9sbGVyLkV2ZW50
LkV4dGVuc2lvblJlbW92ZWQsIHtleHRlbnNpb259KTsKLSAgICB9Ci0KLSAgICBjcmVhdGVUYWJG
b3JFeHRlbnNpb24oZXh0ZW5zaW9uSUQsIHRhYk5hbWUsIHRhYkljb25VUkwsIHNvdXJjZVVSTCkK
LSAgICB7Ci0gICAgICAgIGxldCBleHRlbnNpb24gPSB0aGlzLl9leHRlbnNpb25Gb3JFeHRlbnNp
b25JRE1hcC5nZXQoZXh0ZW5zaW9uSUQpOwotICAgICAgICBpZiAoIWV4dGVuc2lvbikgewotICAg
ICAgICAgICAgV0kucmVwb3J0SW50ZXJuYWxFcnJvcigiVW5hYmxlIHRvIGNyZWF0ZSB0YWIgZm9y
IGV4dGVuc2lvbiB3aXRoIHVua25vd24gSUQ6ICIgKyBleHRlbnNpb25JRCArICIgc291cmNlVVJM
OiAiICsgc291cmNlVVJMKTsKLSAgICAgICAgICAgIHJldHVybiBXSS5XZWJJbnNwZWN0b3JFeHRl
bnNpb24uRXJyb3JDb2RlLkludmFsaWRSZXF1ZXN0OwotICAgICAgICB9Ci0KLSAgICAgICAgbGV0
IGV4dGVuc2lvblRhYklEID0gYFdlYkV4dGVuc2lvblRhYi0ke2V4dGVuc2lvbklEfS0ke3RoaXMu
X25leHRFeHRlbnNpb25UYWJJRCsrfWA7Ci0gICAgICAgIGxldCB0YWJDb250ZW50VmlldyA9IG5l
dyBXSS5XZWJJbnNwZWN0b3JFeHRlbnNpb25UYWJDb250ZW50VmlldyhleHRlbnNpb24sIGV4dGVu
c2lvblRhYklELCB0YWJOYW1lLCB0YWJJY29uVVJMLCBzb3VyY2VVUkwpOwotCi0gICAgICAgIHRo
aXMuX3RhYklEc0ZvckV4dGVuc2lvbklETWFwLmFkZChleHRlbnNpb25JRCwgZXh0ZW5zaW9uVGFi
SUQpOwotICAgICAgICB0aGlzLl9leHRlbnNpb25UYWJDb250ZW50Vmlld0ZvckV4dGVuc2lvblRh
YklETWFwLnNldChleHRlbnNpb25UYWJJRCwgdGFiQ29udGVudFZpZXcpOwotICAgICAgICBXSS50
YWJCcm93c2VyLmFkZFRhYkZvckNvbnRlbnRWaWV3KHRhYkNvbnRlbnRWaWV3KTsKLQotICAgICAg
ICAvLyBUaGUgY2FsbGluZyBjb252ZW50aW9uIGlzIHRvIHJldHVybiBhbiBlcnJvciBzdHJpbmcg
b3IgYSByZXN1bHQgb2JqZWN0LgotICAgICAgICByZXR1cm4ge2V4dGVuc2lvblRhYklEfTsKLSAg
ICB9Ci0KLSAgICBldmFsdWF0ZVNjcmlwdEZvckV4dGVuc2lvbihleHRlbnNpb25JRCwgc2NyaXB0
U291cmNlLCB7ZnJhbWVVUkwsIGNvbnRleHRTZWN1cml0eU9yaWdpbiwgdXNlQ29udGVudFNjcmlw
dENvbnRleHR9ID0ge30pCi0gICAgewotICAgICAgICBsZXQgZXh0ZW5zaW9uID0gdGhpcy5fZXh0
ZW5zaW9uRm9yRXh0ZW5zaW9uSURNYXAuZ2V0KGV4dGVuc2lvbklEKTsKLSAgICAgICAgaWYgKCFl
eHRlbnNpb24pIHsKLSAgICAgICAgICAgIFdJLnJlcG9ydEludGVybmFsRXJyb3IoIlVuYWJsZSB0
byBldmFsdWF0ZSBzY3JpcHQgZm9yIGV4dGVuc2lvbiB3aXRoIHVua25vd24gSUQ6ICIgKyBleHRl
bnNpb25JRCk7Ci0gICAgICAgICAgICByZXR1cm4gV0kuV2ViSW5zcGVjdG9yRXh0ZW5zaW9uLkVy
cm9yQ29kZS5JbnZhbGlkUmVxdWVzdDsKLSAgICAgICAgfQotCi0gICAgICAgIC8vIEZJWE1FOiA8
cmRhcjovL3Byb2JsZW0vNzQxODAzNTU+IGltcGxlbWVudCBleGVjdXRpb24gY29udGV4dCBzZWxl
Y3Rpb24gb3B0aW9ucwotICAgICAgICBpZiAoZnJhbWVVUkwpIHsKLSAgICAgICAgICAgIFdJLnJl
cG9ydEludGVybmFsRXJyb3IoImV2YWx1YXRlU2NyaXB0Rm9yRXh0ZW5zaW9uOiB0aGUgJ2ZyYW1l
VVJMJyBvcHRpb24gaXMgbm90IHlldCBpbXBsZW1lbnRlZC4iKTsKLSAgICAgICAgICAgIHJldHVy
biBXSS5XZWJJbnNwZWN0b3JFeHRlbnNpb24uRXJyb3JDb2RlLk5vdEltcGxlbWVudGVkOwotICAg
ICAgICB9Ci0KLSAgICAgICAgaWYgKGNvbnRleHRTZWN1cml0eU9yaWdpbikgewotICAgICAgICAg
ICAgV0kucmVwb3J0SW50ZXJuYWxFcnJvcigiZXZhbHVhdGVTY3JpcHRGb3JFeHRlbnNpb246IHRo
ZSAnY29udGV4dFNlY3VyaXR5T3JpZ2luJyBvcHRpb24gaXMgbm90IHlldCBpbXBsZW1lbnRlZC4i
KTsKLSAgICAgICAgICAgIHJldHVybiBXSS5XZWJJbnNwZWN0b3JFeHRlbnNpb24uRXJyb3JDb2Rl
Lk5vdEltcGxlbWVudGVkOwotICAgICAgICB9Ci0KLSAgICAgICAgaWYgKHVzZUNvbnRlbnRTY3Jp
cHRDb250ZXh0KSB7Ci0gICAgICAgICAgICBXSS5yZXBvcnRJbnRlcm5hbEVycm9yKCJldmFsdWF0
ZVNjcmlwdEZvckV4dGVuc2lvbjogdGhlICd1c2VDb250ZW50U2NyaXB0Q29udGV4dCcgb3B0aW9u
IGlzIG5vdCB5ZXQgaW1wbGVtZW50ZWQuIik7Ci0gICAgICAgICAgICByZXR1cm4gV0kuV2ViSW5z
cGVjdG9yRXh0ZW5zaW9uLkVycm9yQ29kZS5Ob3RJbXBsZW1lbnRlZDsKLSAgICAgICAgfQotCi0g
ICAgICAgIGxldCBldmFsdWF0aW9uQ29udGV4dCA9IFdJLnJ1bnRpbWVNYW5hZ2VyLmFjdGl2ZUV4
ZWN1dGlvbkNvbnRleHQ7Ci0gICAgICAgIHJldHVybiBldmFsdWF0aW9uQ29udGV4dC50YXJnZXQu
UnVudGltZUFnZW50LmV2YWx1YXRlLmludm9rZSh7Ci0gICAgICAgICAgICBleHByZXNzaW9uOiBz
Y3JpcHRTb3VyY2UsCi0gICAgICAgICAgICBvYmplY3RHcm91cDogImV4dGVuc2lvbi1ldmFsdWF0
aW9uIiwKLSAgICAgICAgICAgIGluY2x1ZGVDb21tYW5kTGluZUFQSTogdHJ1ZSwKLSAgICAgICAg
ICAgIHJldHVybkJ5VmFsdWU6IHRydWUsCi0gICAgICAgICAgICBnZW5lcmF0ZVByZXZpZXc6IGZh
bHNlLAotICAgICAgICAgICAgc2F2ZVJlc3VsdDogZmFsc2UsCi0gICAgICAgICAgICBjb250ZXh0
SWQ6IGV2YWx1YXRpb25Db250ZXh0LmlkLAotICAgICAgICB9KS50aGVuKChwYXlsb2FkKSA9PiB7
Ci0gICAgICAgICAgICBsZXQgcmVzdWx0T3JFcnJvciA9IHBheWxvYWQucmVzdWx0OwotICAgICAg
ICAgICAgbGV0IHdhc1Rocm93biA9IHBheWxvYWQud2FzVGhyb3duOwotICAgICAgICAgICAgbGV0
IHt0eXBlLCB2YWx1ZX0gPSByZXN1bHRPckVycm9yOwotICAgICAgICAgICAgcmV0dXJuIHdhc1Ro
cm93biA/IHsiZXJyb3IiOiByZXN1bHRPckVycm9yLmRlc2NyaXB0aW9ufSA6IHsicmVzdWx0Ijog
dmFsdWV9OwotICAgICAgICB9KS5jYXRjaCgoZXJyb3IpID0+IGVycm9yLmRlc2NyaXB0aW9uKTsK
LSAgICB9Ci0gICAgCi0gICAgcmVsb2FkRm9yRXh0ZW5zaW9uKGV4dGVuc2lvbklELCB7aWdub3Jl
Q2FjaGUsIHVzZXJBZ2VudCwgaW5qZWN0ZWRTY3JpcHR9ID0ge30pCi0gICAgewotICAgICAgICBs
ZXQgZXh0ZW5zaW9uID0gdGhpcy5fZXh0ZW5zaW9uRm9yRXh0ZW5zaW9uSURNYXAuZ2V0KGV4dGVu
c2lvbklEKTsKLSAgICAgICAgaWYgKCFleHRlbnNpb24pIHsKLSAgICAgICAgICAgIFdJLnJlcG9y
dEludGVybmFsRXJyb3IoIlVuYWJsZSB0byBldmFsdWF0ZSBzY3JpcHQgZm9yIGV4dGVuc2lvbiB3
aXRoIHVua25vd24gSUQ6ICIgKyBleHRlbnNpb25JRCk7Ci0gICAgICAgICAgICByZXR1cm4gV0ku
V2ViSW5zcGVjdG9yRXh0ZW5zaW9uLkVycm9yQ29kZS5JbnZhbGlkUmVxdWVzdDsKLSAgICAgICAg
fQotCi0gICAgICAgIC8vIEZJWE1FOiA8d2Via2l0Lm9yZy9iLzIyMjMyOD4gSW1wbGVtZW50IGB1
c2VyQWdlbnRgIGFuZCBgaW5qZWN0ZWRTY3JpcHRgIG9wdGlvbnMgZm9yIGBkZXZ0b29scy5pbnNw
ZWN0ZWRXaW5kb3cucmVsb2FkYCBjb21tYW5kCi0gICAgICAgIGlmICh1c2VyQWdlbnQpIHsKLSAg
ICAgICAgICAgIFdJLnJlcG9ydEludGVybmFsRXJyb3IoInJlbG9hZEZvckV4dGVuc2lvbjogdGhl
ICd1c2VyQWdlbnQnIG9wdGlvbiBpcyBub3QgeWV0IGltcGxlbWVudGVkLiIpOwotICAgICAgICAg
ICAgcmV0dXJuIFdJLldlYkluc3BlY3RvckV4dGVuc2lvbi5FcnJvckNvZGUuTm90SW1wbGVtZW50
ZWQ7Ci0gICAgICAgIH0KLQotICAgICAgICBpZiAoaW5qZWN0ZWRTY3JpcHQpIHsKLSAgICAgICAg
ICAgIFdJLnJlcG9ydEludGVybmFsRXJyb3IoInJlbG9hZEZvckV4dGVuc2lvbjogdGhlICdpbmpl
Y3RlZFNjcmlwdCcgb3B0aW9uIGlzIG5vdCB5ZXQgaW1wbGVtZW50ZWQuIik7Ci0gICAgICAgICAg
ICByZXR1cm4gV0kuV2ViSW5zcGVjdG9yRXh0ZW5zaW9uLkVycm9yQ29kZS5Ob3RJbXBsZW1lbnRl
ZDsKLSAgICAgICAgfQotICAgICAgICAKLSAgICAgICAgbGV0IHRhcmdldCA9IFdJLmFzc3VtaW5n
TWFpblRhcmdldCgpOwotICAgICAgICBpZiAoIXRhcmdldC5oYXNDb21tYW5kKCJQYWdlLnJlbG9h
ZCIpKQotICAgICAgICAgICAgcmV0dXJuIFdJLldlYkluc3BlY3RvckV4dGVuc2lvbi5FcnJvckNv
ZGUuSW52YWxpZFJlcXVlc3Q7Ci0gICAgICAgIAotICAgICAgICByZXR1cm4gdGFyZ2V0LlBhZ2VB
Z2VudC5yZWxvYWQuaW52b2tlKHtpZ25vcmVDYWNoZX0pOwotICAgIH0KLSAgICAKLSAgICBzaG93
RXh0ZW5zaW9uVGFiKGV4dGVuc2lvblRhYklEKQotICAgIHsKLSAgICAgICAgbGV0IHRhYkNvbnRl
bnRWaWV3ID0gdGhpcy5fZXh0ZW5zaW9uVGFiQ29udGVudFZpZXdGb3JFeHRlbnNpb25UYWJJRE1h
cC5nZXQoZXh0ZW5zaW9uVGFiSUQpOwotICAgICAgICBpZiAoIXRhYkNvbnRlbnRWaWV3KSB7Ci0g
ICAgICAgICAgICBXSS5yZXBvcnRJbnRlcm5hbEVycm9yKCJVbmFibGUgdG8gc2hvdyBleHRlbnNp
b24gdGFiIHdpdGggdW5rbm93biBleHRlbnNpb25UYWJJRDogIiArIGV4dGVuc2lvblRhYklEKTsK
LSAgICAgICAgICAgIHJldHVybiBXSS5XZWJJbnNwZWN0b3JFeHRlbnNpb24uRXJyb3JDb2RlLklu
dmFsaWRSZXF1ZXN0OwotICAgICAgICB9Ci0KLSAgICAgICAgbGV0IHN1Y2Nlc3MgPSBXSS50YWJC
cm93c2VyLnNob3dUYWJGb3JDb250ZW50Vmlldyh0YWJDb250ZW50VmlldywgewotICAgICAgICAg
ICAgaW5pdGlhdG9ySGludDogV0kuVGFiQnJvd3Nlci5UYWJOYXZpZ2F0aW9uSW5pdGlhdG9yLkZy
b250ZW5kQVBJLAotICAgICAgICB9KTsKLQotICAgICAgICBpZiAoIXN1Y2Nlc3MpIHsKLSAgICAg
ICAgICAgIFdJLnJlcG9ydEludGVybmFsRXJyb3IoIlVuYWJsZSB0byBzaG93IGV4dGVuc2lvbiB0
YWIgd2l0aCBleHRlbnNpb25UYWJJRDogIiArIGV4dGVuc2lvblRhYklEKTsKLSAgICAgICAgICAg
IHJldHVybiBXSS5XZWJJbnNwZWN0b3JFeHRlbnNpb24uRXJyb3JDb2RlLkludGVybmFsRXJyb3I7
Ci0gICAgICAgIH0KLSAgICB9Ci0KLSAgICBldmFsdWF0ZVNjcmlwdEluRXh0ZW5zaW9uVGFiKGV4
dGVuc2lvblRhYklELCBzY3JpcHRTb3VyY2UpCi0gICAgewotICAgICAgICBsZXQgdGFiQ29udGVu
dFZpZXcgPSB0aGlzLl9leHRlbnNpb25UYWJDb250ZW50Vmlld0ZvckV4dGVuc2lvblRhYklETWFw
LmdldChleHRlbnNpb25UYWJJRCk7Ci0gICAgICAgIGlmICghdGFiQ29udGVudFZpZXcpIHsKLSAg
ICAgICAgICAgIFdJLnJlcG9ydEludGVybmFsRXJyb3IoIlVuYWJsZSB0byBldmFsdWF0ZSB3aXRo
IHVua25vd24gZXh0ZW5zaW9uVGFiSUQ6ICIgKyBleHRlbnNpb25UYWJJRCk7Ci0gICAgICAgICAg
ICByZXR1cm4gV0kuV2ViSW5zcGVjdG9yRXh0ZW5zaW9uLkVycm9yQ29kZS5JbnZhbGlkUmVxdWVz
dDsKLSAgICAgICAgfQotCi0gICAgICAgIGxldCBpZnJhbWUgPSB0YWJDb250ZW50Vmlldy5pZnJh
bWVFbGVtZW50OwotICAgICAgICBpZiAoIShpZnJhbWUgaW5zdGFuY2VvZiBIVE1MSUZyYW1lRWxl
bWVudCkpIHsKLSAgICAgICAgICAgIFdJLnJlcG9ydEludGVybmFsRXJyb3IoIlVuYWJsZSB0byBl
dmFsdWF0ZSB3aXRob3V0IGFuIDxpZnJhbWU+IGZvciBleHRlbnNpb25UYWJJRDogIiArIGV4dGVu
c2lvblRhYklEKTsKLSAgICAgICAgICAgIHJldHVybiBXSS5XZWJJbnNwZWN0b3JFeHRlbnNpb24u
RXJyb3JDb2RlLkludmFsaWRSZXF1ZXN0OwotICAgICAgICB9Ci0KLSAgICAgICAgdHJ5IHsKLSAg
ICAgICAgICAgIHJldHVybiB7cmVzdWx0OiBJbnNwZWN0b3JGcm9udGVuZEhvc3QuZXZhbHVhdGVT
Y3JpcHRJbkV4dGVuc2lvblRhYihpZnJhbWUsIHNjcmlwdFNvdXJjZSl9OwotICAgICAgICB9IGNh
dGNoIChlcnJvcikgewotICAgICAgICAgICAgcmV0dXJuIHtlcnJvcjogZXJyb3IubWVzc2FnZX07
Ci0gICAgICAgIH0KLSAgICB9Ci0KLSAgICAvLyBQcml2YXRlCi0KLSAgICBfaGFuZGxlTWFpblJl
c291cmNlRGlkQ2hhbmdlKGV2ZW50KQotICAgIHsKLSAgICAgICAgaWYgKCFldmVudC50YXJnZXQu
aXNNYWluRnJhbWUoKSkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICAvLyBEb24ndCBm
aXJlIHRoZSBldmVudCB1bmxlc3Mgb25lIG9yIG1vcmUgZXh0ZW5zaW9ucyBhcmUgcmVnaXN0ZXJl
ZC4KLSAgICAgICAgaWYgKCF0aGlzLl9leHRlbnNpb25Gb3JFeHRlbnNpb25JRE1hcC5zaXplKQot
ICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIEluc3BlY3RvckZyb250ZW5kSG9zdC5pbnNw
ZWN0ZWRQYWdlRGlkTmF2aWdhdGUoV0kubmV0d29ya01hbmFnZXIubWFpbkZyYW1lLnVybCk7Ci0g
ICAgfQotfTsKLQotV0kuV2ViSW5zcGVjdG9yRXh0ZW5zaW9uQ29udHJvbGxlci5FdmVudCA9IHsK
LSAgICBFeHRlbnNpb25BZGRlZDogImV4dGVuc2lvbi1hZGRlZCIsCi0gICAgRXh0ZW5zaW9uUmVt
b3ZlZDogImV4dGVuc2lvbi1yZW1vdmVkIiwKLX07Cg==
</data>

          </attachment>
      

    </bug>

</bugzilla>