<?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>34617</bug_id>
          
          <creation_ts>2010-02-04 14:21:36 -0800</creation_ts>
          <short_desc>Web Inspector: group cookies by frame, show total cookies size, allow sorting cookie table.</short_desc>
          <delta_ts>2010-02-05 11:23:05 -0800</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 (Deprecated)</component>
          <version>528+ (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></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Pavel Feldman">pfeldman</reporter>
          <assigned_to name="Pavel Feldman">pfeldman</assigned_to>
          <cc>bweinstein</cc>
    
    <cc>joepeck</cc>
    
    <cc>rik</cc>
    
    <cc>timothy</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>187940</commentid>
    <comment_count>0</comment_count>
    <who name="Pavel Feldman">pfeldman</who>
    <bug_when>2010-02-04 14:21:36 -0800</bug_when>
    <thetext>Patch will follow.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>187941</commentid>
    <comment_count>1</comment_count>
      <attachid>48170</attachid>
    <who name="Pavel Feldman">pfeldman</who>
    <bug_when>2010-02-04 14:22:30 -0800</bug_when>
    <thetext>Created attachment 48170
[PATCH] Proposed change.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>188229</commentid>
    <comment_count>2</comment_count>
    <who name="Pavel Feldman">pfeldman</who>
    <bug_when>2010-02-05 11:23:05 -0800</bug_when>
    <thetext>Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	WebCore/ChangeLog
	M	WebCore/English.lproj/localizedStrings.js
	M	WebCore/inspector/InspectorController.cpp
	M	WebCore/inspector/front-end/CookieItemsView.js
	M	WebCore/inspector/front-end/StoragePanel.js
	M	WebCore/inspector/front-end/inspector.js
Committed r54435</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>48170</attachid>
            <date>2010-02-04 14:22:30 -0800</date>
            <delta_ts>2010-02-04 14:36:52 -0800</delta_ts>
            <desc>[PATCH] Proposed change.</desc>
            <filename>cookies_size</filename>
            <type>text/plain</type>
            <size>16649</size>
            <attacher name="Pavel Feldman">pfeldman</attacher>
            
              <data encoding="base64">ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg
Y2Q1YTFkMC4uZTIzMmUyZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi
Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNCBAQAorMjAxMC0wMi0wNCAgUGF2ZWwgRmVsZG1h
biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBncm91cCBjb29raWVzIGJ5IGZyYW1l
LCBzaG93IHRvdGFsIGNvb2tpZXMgc2l6ZSwgYWxsb3cgc29ydGluZyBjb29raWUgdGFibGUuCisK
KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0NjE3CisK
KyAgICAgICAgKiBFbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6CisgICAgICAgICog
aW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5z
cGVjdG9yQ29udHJvbGxlcjo6ZGVsZXRlQ29va2llKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv
bnQtZW5kL0Nvb2tpZUl0ZW1zVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db29raWVJ
dGVtc1ZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvb2tpZUl0ZW1zVmlldy5wcm90b3R5
cGUudXBkYXRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db29raWVJdGVtc1ZpZXcucHJvdG90
eXBlLl91cGRhdGVXaXRoQ29va2llcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29va2llSXRl
bXNWaWV3LnByb3RvdHlwZS5fY29va2llc0ZvckRvbWFpbik6CisgICAgICAgIChXZWJJbnNwZWN0
b3IuQ29va2llSXRlbXNWaWV3LnByb3RvdHlwZS5kYXRhR3JpZEZvckNvb2tpZXMpOgorICAgICAg
ICAoV2ViSW5zcGVjdG9yLkNvb2tpZUl0ZW1zVmlldy5wcm90b3R5cGUuX2NyZWF0ZU5vZGVzKToK
KyAgICAgICAgKFdlYkluc3BlY3Rvci5Db29raWVJdGVtc1ZpZXcucHJvdG90eXBlLl9zb3J0RGF0
YS5sb2NhbGVDb21wYXJlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db29raWVJdGVtc1ZpZXcu
cHJvdG90eXBlLl9zb3J0RGF0YS5udW1iZXJDb21wYXJlKToKKyAgICAgICAgKFdlYkluc3BlY3Rv
ci5Db29raWVJdGVtc1ZpZXcucHJvdG90eXBlLl9zb3J0RGF0YS5leHBpcmVzQ29tcGFyZSk6Cisg
ICAgICAgIChXZWJJbnNwZWN0b3IuQ29va2llSXRlbXNWaWV3LnByb3RvdHlwZS5fc29ydERhdGEp
OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU3RvcmFnZVBhbmVsLmpzOgorICAgICAg
ICAoV2ViSW5zcGVjdG9yLlN0b3JhZ2VQYW5lbC5wcm90b3R5cGUuc2hvd0Nvb2tpZXMpOgorICAg
ICAgICAoV2ViSW5zcGVjdG9yLkNvb2tpZVNpZGViYXJUcmVlRWxlbWVudCk6CisgICAgICAgIChX
ZWJJbnNwZWN0b3IuQ29va2llU2lkZWJhclRyZWVFbGVtZW50LnByb3RvdHlwZS5vbnNlbGVjdCk6
CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29va2llU2lkZWJhclRyZWVFbGVtZW50LnByb3RvdHlw
ZS5nZXQgc3VidGl0bGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvb2tpZVNpZGViYXJUcmVl
RWxlbWVudC5wcm90b3R5cGUuc2V0IHN1YnRpdGxlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv
bnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci51cGRhdGVSZXNvdXJj
ZSk6CisKIDIwMTAtMDItMDQgIEVucmljYSBDYXN1Y2NpICA8ZW5yaWNhQGFwcGxlLmNvbT4KIAog
ICAgICAgICBSZXZpZXdlZCBieSBPbGl2ZXIgSHVudC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvRW5n
bGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xv
Y2FsaXplZFN0cmluZ3MuanMKaW5kZXggNjM3ZDRhNi4uOTE5NjY5MiAxMDA2NDQKQmluYXJ5IGZp
bGVzIGEvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYW5kIGIvV2Vi
Q29yZS9FbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgZGlmZmVyCmRpZmYgLS1naXQg
YS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcCBiL1dlYkNvcmUvaW5z
cGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCmluZGV4IGFlNGUyNDMuLjQzNTA0NDMgMTAw
NjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCisrKyBi
L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCkBAIC0xODAyLDcgKzE4
MDIsNyBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OmRlbGV0ZUNvb2tpZShjb25zdCBTdHJp
bmcmIGNvb2tpZU5hbWUsIGNvbnN0IFN0cmluZyYgZAogICAgIGZvciAoUmVzb3VyY2VzTWFwOjpp
dGVyYXRvciBpdCA9IG1fcmVzb3VyY2VzLmJlZ2luKCk7IGl0ICE9IHJlc291cmNlc0VuZDsgKytp
dCkgewogICAgICAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBpdC0+c2Vjb25kLT5mcmFtZSgpLT5k
b2N1bWVudCgpOwogICAgICAgICBpZiAoZG9jdW1lbnQtPnVybCgpLmhvc3QoKSA9PSBkb21haW4p
Ci0gICAgICAgICAgICBXZWJDb3JlOjpkZWxldGVDb29raWUoZG9jdW1lbnQsIGRvY3VtZW50LT5j
b29raWVVUkwoKSwgY29va2llTmFtZSk7CisgICAgICAgICAgICBXZWJDb3JlOjpkZWxldGVDb29r
aWUoZG9jdW1lbnQsIGl0LT5zZWNvbmQtPnJlcXVlc3RVUkwoKSwgY29va2llTmFtZSk7CiAgICAg
fQogfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29va2llSXRl
bXNWaWV3LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nvb2tpZUl0ZW1zVmlldy5q
cwppbmRleCBlNGQ2MDE4Li4zYWY5YzJlIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9m
cm9udC1lbmQvQ29va2llSXRlbXNWaWV3LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250
LWVuZC9Db29raWVJdGVtc1ZpZXcuanMKQEAgLTI3LDcgKzI3LDcgQEAKICAqIFRISVMgU09GVFdB
UkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAg
Ki8KIAotV2ViSW5zcGVjdG9yLkNvb2tpZUl0ZW1zVmlldyA9IGZ1bmN0aW9uKGNvb2tpZURvbWFp
bikKK1dlYkluc3BlY3Rvci5Db29raWVJdGVtc1ZpZXcgPSBmdW5jdGlvbih0cmVlRWxlbWVudCwg
Y29va2llRG9tYWluKQogewogICAgIFdlYkluc3BlY3Rvci5WaWV3LmNhbGwodGhpcyk7CiAKQEAg
LTQxLDYgKzQxLDcgQEAgV2ViSW5zcGVjdG9yLkNvb2tpZUl0ZW1zVmlldyA9IGZ1bmN0aW9uKGNv
b2tpZURvbWFpbikKICAgICB0aGlzLnJlZnJlc2hCdXR0b24gPSBuZXcgV2ViSW5zcGVjdG9yLlN0
YXR1c0JhckJ1dHRvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlZnJlc2giKSwgInJlZnJlc2gt
c3RvcmFnZS1zdGF0dXMtYmFyLWl0ZW0iKTsKICAgICB0aGlzLnJlZnJlc2hCdXR0b24uYWRkRXZl
bnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9yZWZyZXNoQnV0dG9uQ2xpY2tlZC5iaW5kKHRoaXMp
LCBmYWxzZSk7CiAgICAgCisgICAgdGhpcy5fdHJlZUVsZW1lbnQgPSB0cmVlRWxlbWVudDsKICAg
ICB0aGlzLl9jb29raWVEb21haW4gPSBjb29raWVEb21haW47CiB9CiAKQEAgLTY1LDUxICs2Niw2
MSBAQCBXZWJJbnNwZWN0b3IuQ29va2llSXRlbXNWaWV3LnByb3RvdHlwZSA9IHsKICAgICB1cGRh
dGU6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHRoaXMuZWxlbWVudC5yZW1vdmVDaGlsZHJl
bigpOworICAgICAgICBXZWJJbnNwZWN0b3IuQ29va2llcy5nZXRDb29raWVzQXN5bmModGhpcy5f
dXBkYXRlV2l0aENvb2tpZXMuYmluZCh0aGlzKSk7CisgICAgfSwKIAotICAgICAgICB2YXIgc2Vs
ZiA9IHRoaXM7Ci0gICAgICAgIGZ1bmN0aW9uIGNhbGxiYWNrKGFsbENvb2tpZXMsIGlzQWR2YW5j
ZWQpIHsKLSAgICAgICAgICAgIHZhciBjb29raWVzID0gc2VsZi5fY29va2llc0ZvckRvbWFpbihh
bGxDb29raWVzKTsKLSAgICAgICAgICAgIHZhciBkYXRhR3JpZCA9IChpc0FkdmFuY2VkID8gc2Vs
Zi5kYXRhR3JpZEZvckNvb2tpZXMoY29va2llcykgOiBzZWxmLnNpbXBsZURhdGFHcmlkRm9yQ29v
a2llcyhjb29raWVzKSk7Ci0gICAgICAgICAgICBpZiAoZGF0YUdyaWQpIHsKLSAgICAgICAgICAg
ICAgICBzZWxmLl9kYXRhR3JpZCA9IGRhdGFHcmlkOwotICAgICAgICAgICAgICAgIHNlbGYuZWxl
bWVudC5hcHBlbmRDaGlsZChkYXRhR3JpZC5lbGVtZW50KTsKLSAgICAgICAgICAgICAgICBzZWxm
Ll9kYXRhR3JpZC51cGRhdGVXaWR0aHMoKTsKLSAgICAgICAgICAgICAgICBpZiAoaXNBZHZhbmNl
ZCkKLSAgICAgICAgICAgICAgICAgICAgc2VsZi5kZWxldGVCdXR0b24udmlzaWJsZSA9IHRydWU7
Ci0gICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIHZhciBlbXB0eU1zZ0VsZW1l
bnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAgICAgICAgICAgICBlbXB0
eU1zZ0VsZW1lbnQuY2xhc3NOYW1lID0gInN0b3JhZ2UtdGFibGUtZW1wdHkiOwotICAgICAgICAg
ICAgICAgIGVtcHR5TXNnRWxlbWVudC50ZXh0Q29udGVudCA9IFdlYkluc3BlY3Rvci5VSVN0cmlu
ZygiVGhpcyBzaXRlIGhhcyBubyBjb29raWVzLiIpOwotICAgICAgICAgICAgICAgIHNlbGYuZWxl
bWVudC5hcHBlbmRDaGlsZChlbXB0eU1zZ0VsZW1lbnQpOwotICAgICAgICAgICAgICAgIHNlbGYu
X2RhdGFHcmlkID0gbnVsbDsKLSAgICAgICAgICAgICAgICBzZWxmLmRlbGV0ZUJ1dHRvbi52aXNp
YmxlID0gZmFsc2U7Ci0gICAgICAgICAgICB9CisgICAgX3VwZGF0ZVdpdGhDb29raWVzOiBmdW5j
dGlvbihhbGxDb29raWVzLCBpc0FkdmFuY2VkKQorICAgIHsKKyAgICAgICAgdmFyIGNvb2tpZXMg
PSB0aGlzLl9jb29raWVzRm9yRG9tYWluKGFsbENvb2tpZXMsIGlzQWR2YW5jZWQpOworICAgICAg
ICB2YXIgZGF0YUdyaWQgPSAoaXNBZHZhbmNlZCA/IHRoaXMuZGF0YUdyaWRGb3JDb29raWVzKGNv
b2tpZXMpIDogdGhpcy5zaW1wbGVEYXRhR3JpZEZvckNvb2tpZXMoY29va2llcykpOworICAgICAg
ICBpZiAoZGF0YUdyaWQpIHsKKyAgICAgICAgICAgIHRoaXMuX2RhdGFHcmlkID0gZGF0YUdyaWQ7
CisgICAgICAgICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQoZGF0YUdyaWQuZWxlbWVudCk7
CisgICAgICAgICAgICB0aGlzLl9kYXRhR3JpZC51cGRhdGVXaWR0aHMoKTsKKyAgICAgICAgICAg
IGlmIChpc0FkdmFuY2VkKQorICAgICAgICAgICAgICAgIHRoaXMuZGVsZXRlQnV0dG9uLnZpc2li
bGUgPSB0cnVlOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgdmFyIGVtcHR5TXNnRWxl
bWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgICAgICAgICAgZW1wdHlN
c2dFbGVtZW50LmNsYXNzTmFtZSA9ICJzdG9yYWdlLXRhYmxlLWVtcHR5IjsKKyAgICAgICAgICAg
IGVtcHR5TXNnRWxlbWVudC50ZXh0Q29udGVudCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiVGhp
cyBzaXRlIGhhcyBubyBjb29raWVzLiIpOworICAgICAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVu
ZENoaWxkKGVtcHR5TXNnRWxlbWVudCk7CisgICAgICAgICAgICB0aGlzLl9kYXRhR3JpZCA9IG51
bGw7CisgICAgICAgICAgICB0aGlzLmRlbGV0ZUJ1dHRvbi52aXNpYmxlID0gZmFsc2U7CiAgICAg
ICAgIH0KLQotICAgICAgICBXZWJJbnNwZWN0b3IuQ29va2llcy5nZXRDb29raWVzQXN5bmMoY2Fs
bGJhY2spOwogICAgIH0sCiAKLSAgICBfY29va2llc0ZvckRvbWFpbjogZnVuY3Rpb24oYWxsQ29v
a2llcykKKyAgICBfY29va2llc0ZvckRvbWFpbjogZnVuY3Rpb24oYWxsQ29va2llcywgaXNBZHZh
bmNlZCkKICAgICB7CiAgICAgICAgIHZhciBjb29raWVzRm9yRG9tYWluID0gW107CiAgICAgICAg
IHZhciByZXNvdXJjZVVSTHNGb3JEb2N1bWVudFVSTCA9IFtdOworICAgICAgICB2YXIgdG90YWxT
aXplID0gMDsKIAogICAgICAgICBmb3IgKHZhciBpZCBpbiBXZWJJbnNwZWN0b3IucmVzb3VyY2Vz
KSB7CiAgICAgICAgICAgICB2YXIgcmVzb3VyY2UgPSBXZWJJbnNwZWN0b3IucmVzb3VyY2VzW2lk
XTsKLSAgICAgICAgICAgIHZhciBtYXRjaCA9IHJlc291cmNlLnVybC5tYXRjaChXZWJJbnNwZWN0
b3IuVVJMUmVnRXhwKTsKKyAgICAgICAgICAgIHZhciBtYXRjaCA9IHJlc291cmNlLmRvY3VtZW50
VVJMLm1hdGNoKFdlYkluc3BlY3Rvci5VUkxSZWdFeHApOwogICAgICAgICAgICAgaWYgKG1hdGNo
ICYmIG1hdGNoWzJdID09PSB0aGlzLl9jb29raWVEb21haW4pCiAgICAgICAgICAgICAgICAgcmVz
b3VyY2VVUkxzRm9yRG9jdW1lbnRVUkwucHVzaChyZXNvdXJjZS51cmwpOwogICAgICAgICB9CiAK
ICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBhbGxDb29raWVzLmxlbmd0aDsgKytpKSB7Cisg
ICAgICAgICAgICB2YXIgcHVzaGVkID0gZmFsc2U7CisgICAgICAgICAgICB2YXIgc2l6ZSA9IGFs
bENvb2tpZXNbaV0uc2l6ZTsKICAgICAgICAgICAgIGZvciAodmFyIGogPSAwOyBqIDwgcmVzb3Vy
Y2VVUkxzRm9yRG9jdW1lbnRVUkwubGVuZ3RoOyArK2opIHsKICAgICAgICAgICAgICAgICB2YXIg
cmVzb3VyY2VVUkwgPSByZXNvdXJjZVVSTHNGb3JEb2N1bWVudFVSTFtqXTsKICAgICAgICAgICAg
ICAgICBpZiAoV2ViSW5zcGVjdG9yLkNvb2tpZXMuY29va2llTWF0Y2hlc1Jlc291cmNlVVJMKGFs
bENvb2tpZXNbaV0sIHJlc291cmNlVVJMKSkgewotICAgICAgICAgICAgICAgICAgICBjb29raWVz
Rm9yRG9tYWluLnB1c2goYWxsQ29va2llc1tpXSk7Ci0gICAgICAgICAgICAgICAgICAgIGJyZWFr
OworICAgICAgICAgICAgICAgICAgICB0b3RhbFNpemUgKz0gc2l6ZTsKKyAgICAgICAgICAgICAg
ICAgICAgaWYgKCFwdXNoZWQpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHB1c2hlZCA9IHRy
dWU7CisgICAgICAgICAgICAgICAgICAgICAgICBjb29raWVzRm9yRG9tYWluLnB1c2goYWxsQ29v
a2llc1tpXSk7CisgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB9CiAgICAg
ICAgICAgICB9CiAgICAgICAgIH0KKworICAgICAgICBpZiAoaXNBZHZhbmNlZCkgeworICAgICAg
ICAgICAgdGhpcy5fdHJlZUVsZW1lbnQuc3VidGl0bGUgPSBTdHJpbmcuc3ByaW50ZihXZWJJbnNw
ZWN0b3IuVUlTdHJpbmcoIiVkIGNvb2tpZXMgKCVzKSIpLCBjb29raWVzRm9yRG9tYWluLmxlbmd0
aCwKKyAgICAgICAgICAgICAgICBOdW1iZXIuYnl0ZXNUb1N0cmluZyh0b3RhbFNpemUsIFdlYklu
c3BlY3Rvci5VSVN0cmluZykpOworICAgICAgICB9CiAgICAgICAgIHJldHVybiBjb29raWVzRm9y
RG9tYWluOwogICAgIH0sCiAKQEAgLTEyNCw1MCArMTM1LDMxIEBAIFdlYkluc3BlY3Rvci5Db29r
aWVJdGVtc1ZpZXcucHJvdG90eXBlID0gewogICAgICAgICB2YXIgY29sdW1ucyA9IHsgMDoge30s
IDE6IHt9LCAyOiB7fSwgMzoge30sIDQ6IHt9LCA1OiB7fSwgNjoge30sIDc6IHt9IH07CiAgICAg
ICAgIGNvbHVtbnNbMF0udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk5hbWUiKTsKICAg
ICAgICAgY29sdW1uc1swXS53aWR0aCA9IGNvbHVtbnNbMF0udGl0bGUubGVuZ3RoOworICAgICAg
ICBjb2x1bW5zWzBdLnNvcnRhYmxlID0gdHJ1ZTsKICAgICAgICAgY29sdW1uc1sxXS50aXRsZSA9
IFdlYkluc3BlY3Rvci5VSVN0cmluZygiVmFsdWUiKTsKICAgICAgICAgY29sdW1uc1sxXS53aWR0
aCA9IGNvbHVtbnNbMV0udGl0bGUubGVuZ3RoOworICAgICAgICBjb2x1bW5zWzFdLnNvcnRhYmxl
ID0gdHJ1ZTsKICAgICAgICAgY29sdW1uc1syXS50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmlu
ZygiRG9tYWluIik7CiAgICAgICAgIGNvbHVtbnNbMl0ud2lkdGggPSBjb2x1bW5zWzJdLnRpdGxl
Lmxlbmd0aDsKKyAgICAgICAgY29sdW1uc1syXS5zb3J0YWJsZSA9IHRydWU7CiAgICAgICAgIGNv
bHVtbnNbM10udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlBhdGgiKTsKICAgICAgICAg
Y29sdW1uc1szXS53aWR0aCA9IGNvbHVtbnNbM10udGl0bGUubGVuZ3RoOworICAgICAgICBjb2x1
bW5zWzNdLnNvcnRhYmxlID0gdHJ1ZTsKICAgICAgICAgY29sdW1uc1s0XS50aXRsZSA9IFdlYklu
c3BlY3Rvci5VSVN0cmluZygiRXhwaXJlcyIpOwogICAgICAgICBjb2x1bW5zWzRdLndpZHRoID0g
Y29sdW1uc1s0XS50aXRsZS5sZW5ndGg7CisgICAgICAgIGNvbHVtbnNbNF0uc29ydGFibGUgPSB0
cnVlOwogICAgICAgICBjb2x1bW5zWzVdLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJT
aXplIik7CiAgICAgICAgIGNvbHVtbnNbNV0ud2lkdGggPSBjb2x1bW5zWzVdLnRpdGxlLmxlbmd0
aDsKICAgICAgICAgY29sdW1uc1s1XS5hbGlnbmVkID0gInJpZ2h0IjsKKyAgICAgICAgY29sdW1u
c1s1XS5zb3J0YWJsZSA9IHRydWU7CiAgICAgICAgIGNvbHVtbnNbNl0udGl0bGUgPSBXZWJJbnNw
ZWN0b3IuVUlTdHJpbmcoIkhUVFAiKTsKICAgICAgICAgY29sdW1uc1s2XS53aWR0aCA9IGNvbHVt
bnNbNl0udGl0bGUubGVuZ3RoOwogICAgICAgICBjb2x1bW5zWzZdLmFsaWduZWQgPSAiY2VudGVy
ZWQiOworICAgICAgICBjb2x1bW5zWzZdLnNvcnRhYmxlID0gdHJ1ZTsKICAgICAgICAgY29sdW1u
c1s3XS50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2VjdXJlIik7CiAgICAgICAgIGNv
bHVtbnNbN10ud2lkdGggPSBjb2x1bW5zWzddLnRpdGxlLmxlbmd0aDsKICAgICAgICAgY29sdW1u
c1s3XS5hbGlnbmVkID0gImNlbnRlcmVkIjsKLQotICAgICAgICBmdW5jdGlvbiB1cGRhdGVEYXRh
QW5kQ29sdW1uKGluZGV4LCB2YWx1ZSkgewotICAgICAgICAgICAgZGF0YVtpbmRleF0gPSB2YWx1
ZTsKLSAgICAgICAgICAgIGlmICh2YWx1ZS5sZW5ndGggPiBjb2x1bW5zW2luZGV4XS53aWR0aCkK
LSAgICAgICAgICAgICAgICBjb2x1bW5zW2luZGV4XS53aWR0aCA9IHZhbHVlLmxlbmd0aDsKLSAg
ICAgICAgfQotCi0gICAgICAgIHZhciBkYXRhOwotICAgICAgICB2YXIgbm9kZXMgPSBbXTsKLSAg
ICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBjb29raWVzLmxlbmd0aDsgKytpKSB7Ci0gICAgICAg
ICAgICB2YXIgY29va2llID0gY29va2llc1tpXTsKLSAgICAgICAgICAgIGRhdGEgPSB7fTsKLQot
ICAgICAgICAgICAgdXBkYXRlRGF0YUFuZENvbHVtbigwLCBjb29raWUubmFtZSk7Ci0gICAgICAg
ICAgICB1cGRhdGVEYXRhQW5kQ29sdW1uKDEsIGNvb2tpZS52YWx1ZSk7Ci0gICAgICAgICAgICB1
cGRhdGVEYXRhQW5kQ29sdW1uKDIsIGNvb2tpZS5kb21haW4pOwotICAgICAgICAgICAgdXBkYXRl
RGF0YUFuZENvbHVtbigzLCBjb29raWUucGF0aCk7Ci0gICAgICAgICAgICB1cGRhdGVEYXRhQW5k
Q29sdW1uKDQsIChjb29raWUuc2Vzc2lvbiA/IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2Vzc2lv
biIpIDogY29va2llLmV4cGlyZXMudG9HTVRTdHJpbmcoKSkpOwotICAgICAgICAgICAgdXBkYXRl
RGF0YUFuZENvbHVtbig1LCBOdW1iZXIuYnl0ZXNUb1N0cmluZyhjb29raWUuc2l6ZSwgV2ViSW5z
cGVjdG9yLlVJU3RyaW5nKSk7Ci0gICAgICAgICAgICB1cGRhdGVEYXRhQW5kQ29sdW1uKDYsIChj
b29raWUuaHR0cE9ubHkgPyAiXHUyNzEzIiA6ICIiKSk7IC8vIENoZWNrbWFyawotICAgICAgICAg
ICAgdXBkYXRlRGF0YUFuZENvbHVtbig3LCAoY29va2llLnNlY3VyZSA/ICJcdTI3MTMiIDogIiIp
KTsgLy8gQ2hlY2ttYXJrCi0KLSAgICAgICAgICAgIHZhciBub2RlID0gbmV3IFdlYkluc3BlY3Rv
ci5EYXRhR3JpZE5vZGUoZGF0YSwgZmFsc2UpOwotICAgICAgICAgICAgbm9kZS5jb29raWUgPSBj
b29raWU7Ci0gICAgICAgICAgICBub2RlLnNlbGVjdGFibGUgPSB0cnVlOwotICAgICAgICAgICAg
bm9kZXMucHVzaChub2RlKTsKLSAgICAgICAgfQorICAgICAgICBjb2x1bW5zWzddLnNvcnRhYmxl
ID0gdHJ1ZTsKIAogICAgICAgICB2YXIgdG90YWxDb2x1bW5XaWR0aHMgPSAwOwogICAgICAgICBm
b3IgKHZhciBjb2x1bW5JZGVudGlmaWVyIGluIGNvbHVtbnMpCkBAIC0yMTEsMTUgKzIwMyw5NSBA
QCBXZWJJbnNwZWN0b3IuQ29va2llSXRlbXNWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAg
IGNvbHVtbnNbY29sdW1uSWRlbnRpZmllcl0ud2lkdGggKz0gIiUiOwogCiAgICAgICAgIHZhciBk
YXRhR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWQoY29sdW1ucywgbnVsbCwgdGhpcy5f
ZGVsZXRlQ29va2llQ2FsbGJhY2suYmluZCh0aGlzKSk7Ci0gICAgICAgIHZhciBsZW5ndGggPSBu
b2Rlcy5sZW5ndGg7Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbGVuZ3RoOyArK2kpCisg
ICAgICAgIHZhciBub2RlcyA9IHRoaXMuX2NyZWF0ZU5vZGVzKGRhdGFHcmlkLCBjb29raWVzKTsK
KyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBub2Rlcy5sZW5ndGg7ICsraSkKICAgICAgICAg
ICAgIGRhdGFHcmlkLmFwcGVuZENoaWxkKG5vZGVzW2ldKTsKLSAgICAgICAgaWYgKGxlbmd0aCA+
IDApCisgICAgICAgIGlmIChub2Rlcy5sZW5ndGgpCiAgICAgICAgICAgICBub2Rlc1swXS5zZWxl
Y3RlZCA9IHRydWU7CisgICAgICAgIGRhdGFHcmlkLmFkZEV2ZW50TGlzdGVuZXIoInNvcnRpbmcg
Y2hhbmdlZCIsIHRoaXMuX3NvcnREYXRhLmJpbmQodGhpcywgZGF0YUdyaWQsIGNvb2tpZXMpKTsK
IAogICAgICAgICByZXR1cm4gZGF0YUdyaWQ7CiAgICAgfSwKIAorICAgIF9jcmVhdGVOb2Rlczog
ZnVuY3Rpb24oZGF0YUdyaWQsIGNvb2tpZXMpCisgICAgeworICAgICAgICBmdW5jdGlvbiB1cGRh
dGVEYXRhQW5kQ29sdW1uKGRhdGEsIGluZGV4LCB2YWx1ZSkgeworICAgICAgICAgICAgZGF0YVtp
bmRleF0gPSB2YWx1ZTsKKyAgICAgICAgICAgIGlmICh2YWx1ZS5sZW5ndGggPiBkYXRhR3JpZC5j
b2x1bW5zW2luZGV4XS53aWR0aCkKKyAgICAgICAgICAgICAgICBkYXRhR3JpZC5jb2x1bW5zW2lu
ZGV4XS53aWR0aCA9IHZhbHVlLmxlbmd0aDsKKyAgICAgICAgfQorCisgICAgICAgIHZhciBub2Rl
cyA9IFtdOworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGNvb2tpZXMubGVuZ3RoOyArK2kp
IHsKKyAgICAgICAgICAgIHZhciBkYXRhID0ge307CisgICAgICAgICAgICB2YXIgY29va2llID0g
Y29va2llc1tpXTsKKworICAgICAgICAgICAgdXBkYXRlRGF0YUFuZENvbHVtbihkYXRhLCAwLCBj
b29raWUubmFtZSk7CisgICAgICAgICAgICB1cGRhdGVEYXRhQW5kQ29sdW1uKGRhdGEsIDEsIGNv
b2tpZS52YWx1ZSk7CisgICAgICAgICAgICB1cGRhdGVEYXRhQW5kQ29sdW1uKGRhdGEsIDIsIGNv
b2tpZS5kb21haW4pOworICAgICAgICAgICAgdXBkYXRlRGF0YUFuZENvbHVtbihkYXRhLCAzLCBj
b29raWUucGF0aCk7CisgICAgICAgICAgICB1cGRhdGVEYXRhQW5kQ29sdW1uKGRhdGEsIDQsIChj
b29raWUuc2Vzc2lvbiA/IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2Vzc2lvbiIpIDogY29va2ll
LmV4cGlyZXMudG9HTVRTdHJpbmcoKSkpOworICAgICAgICAgICAgdXBkYXRlRGF0YUFuZENvbHVt
bihkYXRhLCA1LCBOdW1iZXIuYnl0ZXNUb1N0cmluZyhjb29raWUuc2l6ZSwgV2ViSW5zcGVjdG9y
LlVJU3RyaW5nKSk7CisgICAgICAgICAgICB1cGRhdGVEYXRhQW5kQ29sdW1uKGRhdGEsIDYsIChj
b29raWUuaHR0cE9ubHkgPyAiXHUyNzEzIiA6ICIiKSk7IC8vIENoZWNrbWFyaworICAgICAgICAg
ICAgdXBkYXRlRGF0YUFuZENvbHVtbihkYXRhLCA3LCAoY29va2llLnNlY3VyZSA/ICJcdTI3MTMi
IDogIiIpKTsgLy8gQ2hlY2ttYXJrCisKKyAgICAgICAgICAgIHZhciBub2RlID0gbmV3IFdlYklu
c3BlY3Rvci5EYXRhR3JpZE5vZGUoZGF0YSk7CisgICAgICAgICAgICBub2RlLmNvb2tpZSA9IGNv
b2tpZTsKKyAgICAgICAgICAgIG5vZGUuc2VsZWN0YWJsZSA9IHRydWU7CisgICAgICAgICAgICBu
b2Rlcy5wdXNoKG5vZGUpOworICAgICAgICB9CisgICAgICAgIHJldHVybiBub2RlczsKKyAgICB9
LAorCisgICAgX3NvcnREYXRhOiBmdW5jdGlvbihkYXRhR3JpZCwgY29va2llcykKKyAgICB7Cisg
ICAgICAgIHZhciBzb3J0RGlyZWN0aW9uID0gZGF0YUdyaWQuc29ydE9yZGVyID09PSAiYXNjZW5k
aW5nIiA/IDEgOiAtMTsKKworICAgICAgICBmdW5jdGlvbiBsb2NhbGVDb21wYXJlKGZpZWxkLCBj
b29raWUxLCBjb29raWUyKQorICAgICAgICB7CisgICAgICAgICAgICByZXR1cm4gc29ydERpcmVj
dGlvbiAqIChjb29raWUxW2ZpZWxkXSArICIiKS5sb2NhbGVDb21wYXJlKGNvb2tpZTJbZmllbGRd
ICsgIiIpCisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiBudW1iZXJDb21wYXJlKGZpZWxk
LCBjb29raWUxLCBjb29raWUyKQorICAgICAgICB7CisgICAgICAgICAgICByZXR1cm4gc29ydERp
cmVjdGlvbiAqIChjb29raWUxW2ZpZWxkXSAtIGNvb2tpZTJbZmllbGRdKTsKKyAgICAgICAgfQor
CisgICAgICAgIGZ1bmN0aW9uIGV4cGlyZXNDb21wYXJlKGNvb2tpZTEsIGNvb2tpZTIpCisgICAg
ICAgIHsKKyAgICAgICAgICAgIGlmIChjb29raWUxLnNlc3Npb24gIT09IGNvb2tpZTIuc2Vzc2lv
bikKKyAgICAgICAgICAgICAgICByZXR1cm4gc29ydERpcmVjdGlvbiAqIChjb29raWUxLnNlc3Np
b24gPyAxIDogLTEpOworCisgICAgICAgICAgICBpZiAoY29va2llMS5zZXNzaW9uKQorICAgICAg
ICAgICAgICAgIHJldHVybiAwOworCisgICAgICAgICAgICByZXR1cm4gc29ydERpcmVjdGlvbiAq
IChjb29raWUxLmV4cGlyZXMuZ2V0VGltZSgpIC0gY29va2llMi5leHBpcmVzLmdldFRpbWUoKSk7
CisgICAgICAgIH0KKworICAgICAgICB2YXIgY29tcGFyYXRvcjsKKyAgICAgICAgc3dpdGNoIChw
YXJzZUludChkYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllcikpIHsKKyAgICAgICAgICAgIGNh
c2UgMDogY29tcGFyYXRvciA9IGxvY2FsZUNvbXBhcmUuYmluZCh0aGlzLCAibmFtZSIpOyBicmVh
azsKKyAgICAgICAgICAgIGNhc2UgMTogY29tcGFyYXRvciA9IGxvY2FsZUNvbXBhcmUuYmluZCh0
aGlzLCAidmFsdWUiKTsgYnJlYWs7CisgICAgICAgICAgICBjYXNlIDI6IGNvbXBhcmF0b3IgPSBs
b2NhbGVDb21wYXJlLmJpbmQodGhpcywgImRvbWFpbiIpOyBicmVhazsKKyAgICAgICAgICAgIGNh
c2UgMzogY29tcGFyYXRvciA9IGxvY2FsZUNvbXBhcmUuYmluZCh0aGlzLCAicGF0aCIpOyBicmVh
azsKKyAgICAgICAgICAgIGNhc2UgNDogY29tcGFyYXRvciA9IGV4cGlyZXNDb21wYXJlOyBicmVh
azsKKyAgICAgICAgICAgIGNhc2UgNTogY29tcGFyYXRvciA9IG51bWJlckNvbXBhcmUuYmluZCh0
aGlzLCAic2l6ZSIpOyBicmVhazsKKyAgICAgICAgICAgIGNhc2UgNjogY29tcGFyYXRvciA9IGxv
Y2FsZUNvbXBhcmUuYmluZCh0aGlzLCAiaHR0cE9ubHkiKTsgYnJlYWs7CisgICAgICAgICAgICBj
YXNlIDc6IGNvbXBhcmF0b3IgPSBsb2NhbGVDb21wYXJlLmJpbmQodGhpcywgInNlY3VyZSIpOyBi
cmVhazsKKyAgICAgICAgICAgIGRlZmF1bHQ6IGxvY2FsZUNvbXBhcmUuYmluZCh0aGlzLCAibmFt
ZSIpOworICAgICAgICB9CisKKyAgICAgICAgY29va2llcy5zb3J0KGNvbXBhcmF0b3IpOworICAg
ICAgICB2YXIgbm9kZXMgPSB0aGlzLl9jcmVhdGVOb2RlcyhkYXRhR3JpZCwgY29va2llcyk7CisK
KyAgICAgICAgZGF0YUdyaWQucmVtb3ZlQ2hpbGRyZW4oKTsKKyAgICAgICAgZm9yICh2YXIgaSA9
IDA7IGkgPCBub2Rlcy5sZW5ndGg7ICsraSkKKyAgICAgICAgICAgIGRhdGFHcmlkLmFwcGVuZENo
aWxkKG5vZGVzW2ldKTsKKworICAgICAgICBpZiAobm9kZXMubGVuZ3RoKQorICAgICAgICAgICAg
bm9kZXNbMF0uc2VsZWN0ZWQgPSB0cnVlOworICAgIH0sCisKICAgICBzaW1wbGVEYXRhR3JpZEZv
ckNvb2tpZXM6IGZ1bmN0aW9uKGNvb2tpZXMpCiAgICAgewogICAgICAgICBpZiAoIWNvb2tpZXMu
bGVuZ3RoKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0b3JhZ2VQ
YW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdG9yYWdlUGFuZWwuanMKaW5k
ZXggZGVlNDQ0Mi4uMThiYzk4ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt
ZW5kL1N0b3JhZ2VQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3Rv
cmFnZVBhbmVsLmpzCkBAIC0yMjAsMTQgKzIyMCwxNCBAQCBXZWJJbnNwZWN0b3IuU3RvcmFnZVBh
bmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuc3RvcmFnZVZpZXdTdGF0dXNCYXJJ
dGVtc0NvbnRhaW5lci5hcHBlbmRDaGlsZChzdGF0dXNCYXJJdGVtc1tpXSk7CiAgICAgfSwKIAot
ICAgIHNob3dDb29raWVzOiBmdW5jdGlvbihjb29raWVEb21haW4pCisgICAgc2hvd0Nvb2tpZXM6
IGZ1bmN0aW9uKHRyZWVFbGVtZW50LCBjb29raWVEb21haW4pCiAgICAgewogICAgICAgICBpZiAo
dGhpcy52aXNpYmxlVmlldykKICAgICAgICAgICAgIHRoaXMudmlzaWJsZVZpZXcuaGlkZSgpOwog
CiAgICAgICAgIHZhciB2aWV3ID0gdGhpcy5fY29va2llVmlld3NbY29va2llRG9tYWluXTsKICAg
ICAgICAgaWYgKCF2aWV3KSB7Ci0gICAgICAgICAgICB2aWV3ID0gbmV3IFdlYkluc3BlY3Rvci5D
b29raWVJdGVtc1ZpZXcoY29va2llRG9tYWluKTsKKyAgICAgICAgICAgIHZpZXcgPSBuZXcgV2Vi
SW5zcGVjdG9yLkNvb2tpZUl0ZW1zVmlldyh0cmVlRWxlbWVudCwgY29va2llRG9tYWluKTsKICAg
ICAgICAgICAgIHRoaXMuX2Nvb2tpZVZpZXdzW2Nvb2tpZURvbWFpbl0gPSB2aWV3OwogICAgICAg
ICB9CiAKQEAgLTUwNyw2ICs1MDcsNyBAQCBXZWJJbnNwZWN0b3IuQ29va2llU2lkZWJhclRyZWVF
bGVtZW50ID0gZnVuY3Rpb24oY29va2llRG9tYWluKQogewogICAgIFdlYkluc3BlY3Rvci5TaWRl
YmFyVHJlZUVsZW1lbnQuY2FsbCh0aGlzLCAiY29va2llLXNpZGViYXItdHJlZS1pdGVtIiwgY29v
a2llRG9tYWluLCAiIiwgbnVsbCwgZmFsc2UpOwogICAgIHRoaXMuX2Nvb2tpZURvbWFpbiA9IGNv
b2tpZURvbWFpbjsKKyAgICB0aGlzLl9zdWJ0aXRsZSA9ICIiOwogCiAgICAgdGhpcy5yZWZyZXNo
VGl0bGVzKCk7CiB9CkBAIC01MTQsOSArNTE1LDkgQEAgV2ViSW5zcGVjdG9yLkNvb2tpZVNpZGVi
YXJUcmVlRWxlbWVudCA9IGZ1bmN0aW9uKGNvb2tpZURvbWFpbikKIFdlYkluc3BlY3Rvci5Db29r
aWVTaWRlYmFyVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgIG9uc2VsZWN0OiBmdW5jdGlv
bigpCiAgICAgewotICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnN0b3JhZ2Uuc2hvd0Nvb2tp
ZXModGhpcy5fY29va2llRG9tYWluKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5zdG9y
YWdlLnNob3dDb29raWVzKHRoaXMsIHRoaXMuX2Nvb2tpZURvbWFpbik7CiAgICAgfSwKLSAgICAK
KwogICAgIGdldCBtYWluVGl0bGUoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2Nvb2tp
ZURvbWFpbiA/IHRoaXMuX2Nvb2tpZURvbWFpbiA6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiTG9j
YWwgRmlsZXMiKTsKQEAgLTUyOSwxMiArNTMwLDEzIEBAIFdlYkluc3BlY3Rvci5Db29raWVTaWRl
YmFyVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogCiAgICAgZ2V0IHN1YnRpdGxlKCkKICAgICB7
Ci0gICAgICAgIHJldHVybiAiIjsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3N1YnRpdGxlOwogICAg
IH0sCiAKICAgICBzZXQgc3VidGl0bGUoeCkKICAgICB7Ci0gICAgICAgIC8vIERvIG5vdGhpbmcu
CisgICAgICAgIHRoaXMuX3N1YnRpdGxlID0geDsKKyAgICAgICAgdGhpcy5yZWZyZXNoVGl0bGVz
KCk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv
aW5zcGVjdG9yLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpp
bmRleCBjY2QzZDAwLi4wZTRlYTY0IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u
dC1lbmQvaW5zcGVjdG9yLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNw
ZWN0b3IuanMKQEAgLTEwNDYsNyArMTA0NiwxMiBAQCBXZWJJbnNwZWN0b3IudXBkYXRlUmVzb3Vy
Y2UgPSBmdW5jdGlvbihpZGVudGlmaWVyLCBwYXlsb2FkKQogICAgICAgICBpZiAocmVzb3VyY2Uu
bWFpblJlc291cmNlKQogICAgICAgICAgICAgdGhpcy5tYWluUmVzb3VyY2UgPSByZXNvdXJjZTsK
IAotICAgICAgICB0aGlzLl9hZGRDb29raWVEb21haW4ocmVzb3VyY2UuZG9tYWluKTsKKyAgICAg
ICAgdmFyIG1hdGNoID0gcGF5bG9hZC5kb2N1bWVudFVSTC5tYXRjaChXZWJJbnNwZWN0b3IuVVJM
UmVnRXhwKTsKKyAgICAgICAgaWYgKG1hdGNoKSB7CisgICAgICAgICAgICB2YXIgcHJvdG9jb2wg
PSBtYXRjaFsxXS50b0xvd2VyQ2FzZSgpOworICAgICAgICAgICAgaWYgKHByb3RvY29sLmluZGV4
T2YoImh0dHAiKSA9PT0gMCB8fCBwcm90b2NvbCA9PT0gImZpbGUiKQorICAgICAgICAgICAgICAg
IHRoaXMuX2FkZENvb2tpZURvbWFpbihwcm90b2NvbCA9PT0gImZpbGUiID8gIiIgOiBtYXRjaFsy
XSk7CisgICAgICAgIH0KICAgICB9CiAKICAgICBpZiAocGF5bG9hZC5kaWRSZXNwb25zZUNoYW5n
ZSkgewo=
</data>
<flag name="review"
          id="30808"
          type_id="1"
          status="+"
          setter="timothy"
    />
          </attachment>
      

    </bug>

</bugzilla>