<?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>101618</bug_id>
          
          <creation_ts>2012-11-08 09:40:54 -0800</creation_ts>
          <short_desc>[Chromium] http/tests/inspector/indexeddb/database-data.html ASSERT on Win7 following r133855</short_desc>
          <delta_ts>2013-03-18 13:51:10 -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 (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="Joshua Bell">jsbell</reporter>
          <assigned_to name="Alec Flett">alecflett</assigned_to>
          <cc>abarth</cc>
    
    <cc>alecflett</cc>
    
    <cc>apavlov</cc>
    
    <cc>dgrogan</cc>
    
    <cc>hayato</cc>
    
    <cc>keishi</cc>
    
    <cc>loislo</cc>
    
    <cc>pfeldman</cc>
    
    <cc>pmuellr</cc>
    
    <cc>rjkroege</cc>
    
    <cc>vsevik</cc>
    
    <cc>web-inspector-bugs</cc>
    
    <cc>webkit.review.bot</cc>
    
    <cc>yurys</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>761887</commentid>
    <comment_count>0</comment_count>
    <who name="Joshua Bell">jsbell</who>
    <bug_when>2012-11-08 09:40:54 -0800</bug_when>
    <thetext>Flakiness dashboard:

http://test-results.appspot.com/dashboards/flakiness_dashboard.html#tests=http%2Ftests%2Finspector%2Findexeddb%2Fdatabase-data.html

Changeset:

http://trac.webkit.org/changeset/133855

Assert:

STDERR: ASSERTION FAILED: active != m_active

(Stack is useless, unfortunately)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>764405</commentid>
    <comment_count>1</comment_count>
    <who name="Vsevolod Vlasov">vsevik</who>
    <bug_when>2012-11-12 07:34:00 -0800</bug_when>
    <thetext>This is apparently ASSERT(active != m_active); in
void IDBTransaction::setActive(bool active)

Do you have an idea how can this happen?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>764471</commentid>
    <comment_count>2</comment_count>
    <who name="Joshua Bell">jsbell</who>
    <bug_when>2012-11-12 09:04:48 -0800</bug_when>
    <thetext>(In reply to comment #1)
&gt; This is apparently ASSERT(active != m_active); in
&gt; void IDBTransaction::setActive(bool active)
&gt; 
&gt; Do you have an idea how can this happen?

Transactions are &quot;active&quot; when created (so requests can be filed against them), but go &quot;inactive&quot; when control returns to the event loop. When an event is later dispatched in IDBRequest::dispatchEvent the transaction is temporarily made active, the event is dispatched, then the transaction is made inactive again.

So the two likely causes are:
(1) recursion through IDBRequest::dispatchEvent (i.e. it&apos;s already active, and being made active again)
(2) the transaction is not being made inactive when control returns to the event loop

My guess would be #2, since it is currently done by having the script engine call into IDBPendingTransactionMonitor::deactivateNewTransactions() - e.g. in bindings/v8/V8RecursionScope.cpp

In the inspector, this could be done manually e.g. at the end of DataLoader::execute it could call idbTransaction-&gt;setActive(false). I&apos;d do this by introducing a stack-allocated TransactionScope class with ~TransactionScope() { m_transaction-&gt;setActive(false); } and initialize the scope after the transaction is returned from transactionForDatabase().</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>772881</commentid>
    <comment_count>3</comment_count>
    <who name="Vsevolod Vlasov">vsevik</who>
    <bug_when>2012-11-21 06:28:43 -0800</bug_when>
    <thetext>This test is not failing any mroe and according to blamelist from the dashboard http://trac.webkit.org/log/?verbose=on&amp;rev=134988&amp;stop_rev=134516 this was likely fixed in https://bugs.webkit.org/show_bug.cgi?id=102450.
Josh, do you think the fix you mentioned above is still needed?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>773062</commentid>
    <comment_count>4</comment_count>
    <who name="Joshua Bell">jsbell</who>
    <bug_when>2012-11-21 10:04:45 -0800</bug_when>
    <thetext>(In reply to comment #3)
&gt; This test is not failing any mroe and according to blamelist from the dashboard http://trac.webkit.org/log/?verbose=on&amp;rev=134988&amp;stop_rev=134516 this was likely fixed in https://bugs.webkit.org/show_bug.cgi?id=102450.

Weird - I&apos;m not sure how that would affect it, given that was a tiny tweak to a recent refactor.

&gt; Josh, do you think the fix you mentioned above is still needed?

In theory, yes. But if it&apos;s not failing I wouldn&apos;t touch it for now.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>774655</commentid>
    <comment_count>5</comment_count>
    <who name="Robert Kroeger">rjkroege</who>
    <bug_when>2012-11-23 11:13:11 -0800</bug_when>
    <thetext>Fails on Win7 (release) and WinXP as well.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>776861</commentid>
    <comment_count>6</comment_count>
    <who name="Joshua Bell">jsbell</who>
    <bug_when>2012-11-27 09:31:09 -0800</bug_when>
    <thetext>(In reply to comment #5)
&gt; Fails on Win7 (release) and WinXP as well.

Yeah, looks like it&apos;s happening on Linux intermittently as well.

I still think my diagnosis is correct, maybe we want to land a simpler temp fix to ensure it resolves the issue i.e. call setActive() directly at the end of DataLoader::execute</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>844180</commentid>
    <comment_count>7</comment_count>
    <who name="David Grogan">dgrogan</who>
    <bug_when>2013-02-28 10:13:32 -0800</bug_when>
    <thetext>This is reproducible manually as described in http://code.google.com/p/chromium/issues/detail?id=178882

Using the inspector to look at an IDB object store causes an assert to fail. I can reproduce by Resources-&gt;IndexedDB-&gt;Expand a database-&gt;Click an objectstore -&gt; Aw snap

The assertion is ASSERTION FAILED: active != (m_state == Active) at IDBTransaction.cpp(205).
I added some debug logging at the failure point: m_state = 1, Active=1. So an active transaction is being set active.

Alec independently concluded that the solution was to call setActive() at the end of DataLoader::execute.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>852510</commentid>
    <comment_count>8</comment_count>
    <who name="Alec Flett">alecflett</who>
    <bug_when>2013-03-11 11:30:00 -0700</bug_when>
    <thetext>*** Bug 111784 has been marked as a duplicate of this bug. ***</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>852513</commentid>
    <comment_count>9</comment_count>
      <attachid>192519</attachid>
    <who name="Alec Flett">alecflett</who>
    <bug_when>2013-03-11 11:32:50 -0700</bug_when>
    <thetext>Created attachment 192519
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>853739</commentid>
    <comment_count>10</comment_count>
    <who name="Vsevolod Vlasov">vsevik</who>
    <bug_when>2013-03-12 13:29:25 -0700</bug_when>
    <thetext>I don&apos;t get it: this bug is about layout test http/tests/inspector/indexeddb/database-data.html  failing on win debug. We assume this is caused by incorrect &quot;active&quot; state of the transaction triggered by inspector.

Your patch attempts to fix it, hence it should fix the test, meaning this behavior would be covered by this test.

The change in resources-panel.html test that you add here is not adding any new test coverage except for the inspector front-end as far as I can see, database-data.html test is already loading data form object store.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>855007</commentid>
    <comment_count>11</comment_count>
      <attachid>192519</attachid>
    <who name="Vsevolod Vlasov">vsevik</who>
    <bug_when>2013-03-13 23:59:27 -0700</bug_when>
    <thetext>Comment on attachment 192519
Patch

r- per my comment above. I think InspectorIndexedDBAgent.cpp is all we really need here.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>855008</commentid>
    <comment_count>12</comment_count>
    <who name="Vsevolod Vlasov">vsevik</who>
    <bug_when>2013-03-13 23:59:54 -0700</bug_when>
    <thetext>(In reply to comment #11)
&gt; (From update of attachment 192519 [details])
&gt; r- per my comment above. I think InspectorIndexedDBAgent.cpp is all we really need here.

Sprry, &quot;I think InspectorIndexedDBAgent.cpp CHANGE is all we really need here.&quot;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>857321</commentid>
    <comment_count>13</comment_count>
      <attachid>193609</attachid>
    <who name="Alec Flett">alecflett</who>
    <bug_when>2013-03-18 11:04:32 -0700</bug_when>
    <thetext>Created attachment 193609
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>857322</commentid>
    <comment_count>14</comment_count>
    <who name="Alec Flett">alecflett</who>
    <bug_when>2013-03-18 11:05:14 -0700</bug_when>
    <thetext>vsevik@ - I&apos;m sorry you&apos;re right. I didn&apos;t realize there was a Crash expectation set for this test.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>857394</commentid>
    <comment_count>15</comment_count>
      <attachid>193609</attachid>
    <who name="Vsevolod Vlasov">vsevik</who>
    <bug_when>2013-03-18 12:07:18 -0700</bug_when>
    <thetext>Comment on attachment 193609
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=193609&amp;action=review

Please update ChangeLog before landing.

&gt; Source/WebCore/ChangeLog:16
&gt; +        * inspector/front-end/IndexedDBModel.js: Add new event type.

There is no any changes in inspector front-end anymore.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>857451</commentid>
    <comment_count>16</comment_count>
      <attachid>193635</attachid>
    <who name="Alec Flett">alecflett</who>
    <bug_when>2013-03-18 12:59:01 -0700</bug_when>
    <thetext>Created attachment 193635
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>857465</commentid>
    <comment_count>17</comment_count>
      <attachid>193637</attachid>
    <who name="Alec Flett">alecflett</who>
    <bug_when>2013-03-18 13:23:33 -0700</bug_when>
    <thetext>Created attachment 193637
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>857499</commentid>
    <comment_count>18</comment_count>
      <attachid>193637</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2013-03-18 13:51:05 -0700</bug_when>
    <thetext>Comment on attachment 193637
Patch for landing

Clearing flags on attachment: 193637

Committed r146116: &lt;http://trac.webkit.org/changeset/146116&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>857501</commentid>
    <comment_count>19</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2013-03-18 13:51:10 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>192519</attachid>
            <date>2013-03-11 11:32:50 -0700</date>
            <delta_ts>2013-03-18 11:04:28 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-101618-20130311112849.patch</filename>
            <type>text/plain</type>
            <size>9498</size>
            <attacher name="Alec Flett">alecflett</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MzQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTBkNjM0MGRhZGJiOTc2
OTZkMDJlMjYxYmZlOWU4ZjVjNzc3YjM3Ni4uY2VjOTY3ZmVkMzRiNDViZDBkNWRlODFjYWQ4ZTA4
MGZjZGU0YzJkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEzLTAzLTExICBBbGVj
IEZsZXR0ICA8YWxlY2ZsZXR0QGNocm9taXVtLm9yZz4KKworICAgICAgICBJbnNwZWN0b3I6IFtD
aHJvbWl1bV0gaHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5kZXhlZGRiL2RhdGFiYXNlLWRhdGEuaHRt
bCBBU1NFUlQgb24gV2luNyBmb2xsb3dpbmcgcjEzMzg1NQorICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxNjE4CisKKyAgICAgICAgRGVhY3RpdmF0ZSB0
cmFuc2FjdGlvbnMgY3JlYXRlZCBieSB0aGUgaW5zcGVjdG9yLCBiZWZvcmUKKyAgICAgICAgdGhl
eSBhcmUgcmVhY3RpdmF0ZWQgYnkgSW5kZXhlZERCLiBUaGlzIHB1dHMgdHJhbnNhY3Rpb25zCisg
ICAgICAgIGluIGFuIGlkZW50aWNhbCBzdGF0ZSBhcyB3aGVuIHRoZXkgYXJlIGNyZWF0ZWQgYnkg
c2NyaXB0cy4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg
ICBUZXN0OiBNb2RpZmllZCBodHRwL3Rlc3RzL2luc3BlY3Rvci9pbmRleGVkZGIvcmVzb3VyY2Vz
LXBhbmVsLmh0bWwgCisgICAgICAgIHRvIHNlbGVjdCBhbmQgb2JqZWN0IHN0b3JlIGFuZCB3YWl0
IGZvciBpdCB0byBsb2FkLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckluZGV4ZWRE
QkFnZW50LmNwcDogTWFrZSB0cmFuc2FjdGlvbnMgaW5hY3RpdmUgdXBvbiBsZWF2aW5nIHRoZSBp
bnNwZWN0b3IgY29kZS4KKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIGluc3BlY3Rvci9m
cm9udC1lbmQvSW5kZXhlZERCTW9kZWwuanM6IEFkZCBuZXcgZXZlbnQgdHlwZS4KKyAgICAgICAg
KFdlYkluc3BlY3Rvci5JbmRleGVkREJNb2RlbC5wcm90b3R5cGUubG9hZGVkQ2FsbGJhY2spOiBE
aXNwYXRjaCBhbiBldmVudCB3aGVuZXZlciB0aGUgY3Vyc29yIGhhcyBmaW5pc2hlZCBsb2FkaW5n
LgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanM6CisgICAg
ICAgIChXZWJJbnNwZWN0b3IuSW5kZXhlZERCVHJlZUVsZW1lbnQucHJvdG90eXBlLmZpbmREYXRh
YmFzZVRyZWVFbGVtZW50KTogUmVuYW1lZCBmcm9tIF9pZGJEYXRhYmFzZVRyZWVFbGVtZW50Lgor
ICAgICAgICAoV2ViSW5zcGVjdG9yLklEQkRhdGFiYXNlVHJlZUVsZW1lbnQucHJvdG90eXBlLmZp
bmRPYmplY3RTdG9yZVRyZWVFbGVtZW50KTogTmV3IHRvIGV4cG9zZSBmaW5kaW5nIG9iamVjdFN0
b3JlcyB0cmVlIG5vZGVzIGJ5IG5hbWUuCisKIDIwMTMtMDMtMTAgIE1hdHQgRmFsa2VuaGFnZW4g
IDxmYWxrZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEltcGxlbWVudCBpbmVydCBzdWJ0cmVl
cyBuZWVkZWQgZm9yIG1vZGFsIDxkaWFsb2c+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p
bnNwZWN0b3IvSW5zcGVjdG9ySW5kZXhlZERCQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5z
cGVjdG9yL0luc3BlY3RvckluZGV4ZWREQkFnZW50LmNwcAppbmRleCA1N2M2NzIxYjEyYWE1YWIz
OTNlOTc3ZDYzNTlkYjhlODY1NDllZThiLi42NzA2MjA4YzEzMmNjZGY0M2QxNjY0NjU2Yjc0N2Y2
OGRkNjFhMTNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y
SW5kZXhlZERCQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0
b3JJbmRleGVkREJBZ2VudC5jcHAKQEAgLTU1LDYgKzU1LDcgQEAKICNpbmNsdWRlICJJREJNZXRh
ZGF0YS5oIgogI2luY2x1ZGUgIklEQk9iamVjdFN0b3JlLmgiCiAjaW5jbHVkZSAiSURCT3BlbkRC
UmVxdWVzdC5oIgorI2luY2x1ZGUgIklEQlBlbmRpbmdUcmFuc2FjdGlvbk1vbml0b3IuaCIKICNp
bmNsdWRlICJJREJSZXF1ZXN0LmgiCiAjaW5jbHVkZSAiSURCVHJhbnNhY3Rpb24uaCIKICNpbmNs
dWRlICJJbmplY3RlZFNjcmlwdC5oIgpAQCAtMTg5LDYgKzE5MCw3IEBAIHB1YmxpYzoKIAogICAg
ICAgICBSZWZQdHI8SURCRGF0YWJhc2U+IGlkYkRhdGFiYXNlID0gcmVxdWVzdFJlc3VsdC0+aWRi
RGF0YWJhc2UoKTsKICAgICAgICAgbV9leGVjdXRhYmxlV2l0aERhdGFiYXNlLT5leGVjdXRlKGlk
YkRhdGFiYXNlKTsKKyAgICAgICAgSURCUGVuZGluZ1RyYW5zYWN0aW9uTW9uaXRvcjo6ZGVhY3Rp
dmF0ZU5ld1RyYW5zYWN0aW9ucygpOwogICAgICAgICBpZGJEYXRhYmFzZS0+Y2xvc2UoKTsKICAg
ICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5k
ZXhlZERCTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luZGV4
ZWREQk1vZGVsLmpzCmluZGV4IGE1MjU3YTI0YmNiYzM4ZGI0OGY0NzI2MjliZjMwYjEzYjEwOTZh
YzQuLmQ3Y2VkNTE2MjY4MjQ5ZDIyNDkxYzA4NDcyZWY5NGU0YzJjZmMxODcgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5kZXhlZERCTW9kZWwuanMKKysr
IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbmRleGVkREJNb2RlbC5qcwpA
QCAtMTM1LDcgKzEzNSw4IEBAIFdlYkluc3BlY3Rvci5JbmRleGVkREJNb2RlbC5rZXlQYXRoU3Ry
aW5nRnJvbUlEQktleVBhdGggPSBmdW5jdGlvbihpZGJLZXlQYXRoKQogV2ViSW5zcGVjdG9yLklu
ZGV4ZWREQk1vZGVsLkV2ZW50VHlwZXMgPSB7CiAgICAgRGF0YWJhc2VBZGRlZDogIkRhdGFiYXNl
QWRkZWQiLAogICAgIERhdGFiYXNlUmVtb3ZlZDogIkRhdGFiYXNlUmVtb3ZlZCIsCi0gICAgRGF0
YWJhc2VMb2FkZWQ6ICJEYXRhYmFzZUxvYWRlZCIKKyAgICBEYXRhYmFzZUxvYWRlZDogIkRhdGFi
YXNlTG9hZGVkIiwKKyAgICBPYmplY3RTdG9yZURhdGFMb2FkZWQ6ICJPYmplY3RTdG9yZURhdGFM
b2FkZWQiLAogfQogCiBXZWJJbnNwZWN0b3IuSW5kZXhlZERCTW9kZWwucHJvdG90eXBlID0gewpA
QCAtMjg5LDcgKzI5MCw3IEBAIFdlYkluc3BlY3Rvci5JbmRleGVkREJNb2RlbC5wcm90b3R5cGUg
PSB7CiAgICAgICAgICAgICBpZiAoIXRoaXMuX2RhdGFiYXNlTmFtZXNCeVNlY3VyaXR5T3JpZ2lu
W2RhdGFiYXNlSWQuc2VjdXJpdHlPcmlnaW5dKQogICAgICAgICAgICAgICAgIHJldHVybjsKICAg
ICAgICAgICAgIHZhciBkYXRhYmFzZU1vZGVsID0gbmV3IFdlYkluc3BlY3Rvci5JbmRleGVkREJN
b2RlbC5EYXRhYmFzZShkYXRhYmFzZUlkLCBkYXRhYmFzZVdpdGhPYmplY3RTdG9yZXMudmVyc2lv
biwgZGF0YWJhc2VXaXRoT2JqZWN0U3RvcmVzLmludFZlcnNpb24pOwotICAgICAgICAgICAgdGhp
cy5fZGF0YWJhc2VzLnB1dChkYXRhYmFzZUlkLCBkYXRhYmFzZU1vZGVsKTsgCisgICAgICAgICAg
ICB0aGlzLl9kYXRhYmFzZXMucHV0KGRhdGFiYXNlSWQsIGRhdGFiYXNlTW9kZWwpOwogICAgICAg
ICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBkYXRhYmFzZVdpdGhPYmplY3RTdG9yZXMub2JqZWN0
U3RvcmVzLmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICAgICAgdmFyIG9iamVjdFN0b3JlID0g
ZGF0YWJhc2VXaXRoT2JqZWN0U3RvcmVzLm9iamVjdFN0b3Jlc1tpXTsKICAgICAgICAgICAgICAg
ICB2YXIgb2JqZWN0U3RvcmVJREJLZXlQYXRoID0gV2ViSW5zcGVjdG9yLkluZGV4ZWREQk1vZGVs
LmlkYktleVBhdGhGcm9tS2V5UGF0aChvYmplY3RTdG9yZS5rZXlQYXRoKTsKQEAgLTMxOSw3ICsz
MjAsMTQgQEAgV2ViSW5zcGVjdG9yLkluZGV4ZWREQk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAg
Ki8KICAgICBsb2FkT2JqZWN0U3RvcmVEYXRhOiBmdW5jdGlvbihkYXRhYmFzZUlkLCBvYmplY3RT
dG9yZU5hbWUsIGlkYktleVJhbmdlLCBza2lwQ291bnQsIHBhZ2VTaXplLCBjYWxsYmFjaykKICAg
ICB7Ci0gICAgICAgIHRoaXMuX3JlcXVlc3REYXRhKGRhdGFiYXNlSWQsIGRhdGFiYXNlSWQubmFt
ZSwgb2JqZWN0U3RvcmVOYW1lLCAiIiwgaWRiS2V5UmFuZ2UsIHNraXBDb3VudCwgcGFnZVNpemUs
IGNhbGxiYWNrKTsKKyAgICAgICAgdmFyIGRhdGFiYXNlTW9kZWwgPSB0aGlzLl9kYXRhYmFzZXMu
Z2V0KGRhdGFiYXNlSWQpOworICAgICAgICB2YXIgb2JqZWN0U3RvcmVNb2RlbCA9IGRhdGFiYXNl
TW9kZWwub2JqZWN0U3RvcmVzW29iamVjdFN0b3JlTmFtZV07CisKKyAgICAgICAgZnVuY3Rpb24g
bG9hZGVkQ2FsbGJhY2soZW50cmllcywgaGFzTW9yZSkgeworICAgICAgICAgICAgdGhpcy5kaXNw
YXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkluZGV4ZWREQk1vZGVsLkV2ZW50VHlw
ZXMuT2JqZWN0U3RvcmVEYXRhTG9hZGVkLCBvYmplY3RTdG9yZU1vZGVsKTsKKyAgICAgICAgICAg
IGNhbGxiYWNrKGVudHJpZXMsIGhhc01vcmUpOworICAgICAgICB9CisgICAgICAgIHRoaXMuX3Jl
cXVlc3REYXRhKGRhdGFiYXNlSWQsIGRhdGFiYXNlSWQubmFtZSwgb2JqZWN0U3RvcmVOYW1lLCAi
IiwgaWRiS2V5UmFuZ2UsIHNraXBDb3VudCwgcGFnZVNpemUsIGxvYWRlZENhbGxiYWNrLmJpbmQo
dGhpcykpOwogICAgIH0sCiAKICAgICAvKioKQEAgLTM1OSw5ICszNjcsMTAgQEAgV2ViSW5zcGVj
dG9yLkluZGV4ZWREQk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBjb25zb2xl
LmVycm9yKCJJbmRleGVkREJBZ2VudCBlcnJvcjogIiArIGVycm9yKTsKICAgICAgICAgICAgICAg
ICByZXR1cm47CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAKKwogICAgICAgICAgICAgaWYg
KCF0aGlzLl9kYXRhYmFzZU5hbWVzQnlTZWN1cml0eU9yaWdpbltkYXRhYmFzZUlkLnNlY3VyaXR5
T3JpZ2luXSkKICAgICAgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgICAgIHZhciBlbnRy
aWVzID0gW107CiAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGRhdGFFbnRyaWVzLmxl
bmd0aDsgKytpKSB7CiAgICAgICAgICAgICAgICAgdmFyIGtleSA9IFdlYkluc3BlY3Rvci5SZW1v
dGVPYmplY3QuZnJvbVBheWxvYWQoZGF0YUVudHJpZXNbaV0ua2V5KTsKZGlmZiAtLWdpdCBhL1Nv
dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMgYi9Tb3Vy
Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCmluZGV4IDg4
MDYyNjljYzg5ZDJjMTU1YmFmM2FjZTZhYTA0NDJiZjgwNDhjNjguLmE3Y2Y3NGU3YTU3MzBhYjE1
MjlhZWM2NmIwNjgwYTdkNTkwYmZiZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl
Y3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z
cGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwpAQCAtMTQ4Niw3ICsxNDg2LDcgQEAg
V2ViSW5zcGVjdG9yLkluZGV4ZWREQlRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICB7CiAg
ICAgICAgIHZhciBkYXRhYmFzZUlkID0gLyoqIEB0eXBlIHtXZWJJbnNwZWN0b3IuSW5kZXhlZERC
TW9kZWwuRGF0YWJhc2VJZH0gKi8gKGV2ZW50LmRhdGEpOwogCi0gICAgICAgIHZhciBpZGJEYXRh
YmFzZVRyZWVFbGVtZW50ID0gdGhpcy5faWRiRGF0YWJhc2VUcmVlRWxlbWVudChkYXRhYmFzZUlk
KQorICAgICAgICB2YXIgaWRiRGF0YWJhc2VUcmVlRWxlbWVudCA9IHRoaXMuZmluZERhdGFiYXNl
VHJlZUVsZW1lbnQoZGF0YWJhc2VJZCk7CiAgICAgICAgIGlmICghaWRiRGF0YWJhc2VUcmVlRWxl
bWVudCkKICAgICAgICAgICAgIHJldHVybjsKIApAQCAtMTUwMiw3ICsxNTAyLDcgQEAgV2ViSW5z
cGVjdG9yLkluZGV4ZWREQlRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAg
IHZhciBkYXRhYmFzZSA9IC8qKiBAdHlwZSB7V2ViSW5zcGVjdG9yLkluZGV4ZWREQk1vZGVsLkRh
dGFiYXNlfSAqLyAoZXZlbnQuZGF0YSk7CiAKLSAgICAgICAgdmFyIGlkYkRhdGFiYXNlVHJlZUVs
ZW1lbnQgPSB0aGlzLl9pZGJEYXRhYmFzZVRyZWVFbGVtZW50KGRhdGFiYXNlLmRhdGFiYXNlSWQp
CisgICAgICAgIHZhciBpZGJEYXRhYmFzZVRyZWVFbGVtZW50ID0gdGhpcy5maW5kRGF0YWJhc2VU
cmVlRWxlbWVudChkYXRhYmFzZS5kYXRhYmFzZUlkKTsKICAgICAgICAgaWYgKCFpZGJEYXRhYmFz
ZVRyZWVFbGVtZW50KQogICAgICAgICAgICAgcmV0dXJuOwogCkBAIC0xNTEzLDcgKzE1MTMsNyBA
QCBXZWJJbnNwZWN0b3IuSW5kZXhlZERCVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAq
IEBwYXJhbSB7V2ViSW5zcGVjdG9yLkluZGV4ZWREQk1vZGVsLkRhdGFiYXNlSWR9IGRhdGFiYXNl
SWQKICAgICAgKiBAcmV0dXJuIHtXZWJJbnNwZWN0b3IuSURCRGF0YWJhc2VUcmVlRWxlbWVudH0K
ICAgICAgKi8KLSAgICBfaWRiRGF0YWJhc2VUcmVlRWxlbWVudDogZnVuY3Rpb24oZGF0YWJhc2VJ
ZCkKKyAgICBmaW5kRGF0YWJhc2VUcmVlRWxlbWVudDogZnVuY3Rpb24oZGF0YWJhc2VJZCkKICAg
ICB7CiAgICAgICAgIHZhciBpbmRleCA9IC0xOwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8
IHRoaXMuX2lkYkRhdGFiYXNlVHJlZUVsZW1lbnRzLmxlbmd0aDsgKytpKSB7CkBAIC0xNjQxLDYg
KzE2NDEsMTMgQEAgV2ViSW5zcGVjdG9yLklEQkRhdGFiYXNlVHJlZUVsZW1lbnQucHJvdG90eXBl
ID0gewogICAgIH0sCiAKICAgICAvKioKKyAgICAgKiBAcGFybWEge3N0cmluZ30gb2JqZWN0U3Rv
cmVOYW1lCisgICAgICovCisgICAgZmluZE9iamVjdFN0b3JlVHJlZUVsZW1lbnQ6IGZ1bmN0aW9u
KG9iamVjdFN0b3JlTmFtZSkgeworICAgICAgICByZXR1cm4gdGhpcy5faWRiT2JqZWN0U3RvcmVU
cmVlRWxlbWVudHNbb2JqZWN0U3RvcmVOYW1lXTsKKyAgICB9LAorCisgICAgLyoqCiAgICAgICog
QHBhcmFtIHtXZWJJbnNwZWN0b3IuSW5kZXhlZERCTW9kZWwuRGF0YWJhc2V9IGRhdGFiYXNlCiAg
ICAgICovCiAgICAgdXBkYXRlOiBmdW5jdGlvbihkYXRhYmFzZSkKZGlmZiAtLWdpdCBhL0xheW91
dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBlZmJhOTI2MmU4
NzhiY2M0ODhkMjg4MDE3ODI3YjRjMjNmNWE2OTA1Li5jNjExMTcwZjMxYjM1NzhhODM2OTUzODVi
YTM2NzcwMzQ5NjljOTJjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIv
TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTMtMDMtMTEgIEFsZWMg
RmxldHQgIDxhbGVjZmxldHRAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEluc3BlY3RvcjogW0No
cm9taXVtXSBodHRwL3Rlc3RzL2luc3BlY3Rvci9pbmRleGVkZGIvZGF0YWJhc2UtZGF0YS5odG1s
IEFTU0VSVCBvbiBXaW43IGZvbGxvd2luZyByMTMzODU1CisgICAgICAgIGh0dHBzOi8vYnVncy53
ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDE2MTgKKworICAgICAgICBSZXZpZXdlZCBieSBO
T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvaW5zcGVjdG9yL2luZGV4ZWRk
Yi9yZXNvdXJjZXMtcGFuZWwuaHRtbDogQWZ0ZXIgdGhlIG9iamVjdFN0b3JlIGlzIGNyZWF0ZWQs
IHNlbGVjdCBpdCB0byB0ZXN0IGxvYWRpbmcuCisKIDIwMTMtMDMtMTAgIE1hdHQgRmFsa2VuaGFn
ZW4gIDxmYWxrZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEltcGxlbWVudCBpbmVydCBzdWJ0
cmVlcyBuZWVkZWQgZm9yIG1vZGFsIDxkaWFsb2c+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9o
dHRwL3Rlc3RzL2luc3BlY3Rvci9pbmRleGVkZGIvcmVzb3VyY2VzLXBhbmVsLmh0bWwgYi9MYXlv
dXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9pbmRleGVkZGIvcmVzb3VyY2VzLXBhbmVsLmh0
bWwKaW5kZXggYTU2NzE1MWViN2NlMWJiYzNjYjdlODU5Yjc2YTdjMGUwYmQyM2FmYy4uZTg0NjNm
NjE4NDIzNmU1ZTFmOTg5NWUwMDZjOTQ5YTg3ZTkzNmRkZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz
dHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5kZXhlZGRiL3Jlc291cmNlcy1wYW5lbC5odG1sCisr
KyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2luZGV4ZWRkYi9yZXNvdXJjZXMt
cGFuZWwuaHRtbApAQCAtODEsMTAgKzgxLDIxIEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICBX
ZWJJbnNwZWN0b3IucGFuZWxzLnJlc291cmNlcy5pbmRleGVkREJMaXN0VHJlZUVsZW1lbnQucmVm
cmVzaEluZGV4ZWREQigpOwogICAgIH0KIAotICAgIGZ1bmN0aW9uIGRhdGFiYXNlTG9hZGVkKCkK
KyAgICBmdW5jdGlvbiBkYXRhYmFzZUxvYWRlZChldmVudCkKICAgICB7CiAgICAgICAgIGluZGV4
ZWREQk1vZGVsLnJlbW92ZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkluZGV4ZWREQk1vZGVs
LkV2ZW50VHlwZXMuRGF0YWJhc2VMb2FkZWQsIGRhdGFiYXNlTG9hZGVkKTsKICAgICAgICAgSW5z
cGVjdG9yVGVzdC5kdW1wSW5kZXhlZERCVHJlZSgpOworICAgICAgICB2YXIgZGF0YWJhc2UgPSAv
KiogQHR5cGUge1dlYkluc3BlY3Rvci5JbmRleGVkREJNb2RlbC5EYXRhYmFzZX0gKi8gKGV2ZW50
LmRhdGEpOworICAgICAgICB2YXIgaW5kZXhlZERCVHJlZSA9IFdlYkluc3BlY3Rvci5wYW5lbHMu
cmVzb3VyY2VzLmluZGV4ZWREQkxpc3RUcmVlRWxlbWVudDsKKyAgICAgICAgdmFyIGRhdGFiYXNl
VHJlZUVsZW1lbnQgPSBpbmRleGVkREJUcmVlLmZpbmREYXRhYmFzZVRyZWVFbGVtZW50KGRhdGFi
YXNlLmRhdGFiYXNlSWQpOworICAgICAgICB2YXIgb2JqZWN0U3RvcmVFbGVtZW50ID0gZGF0YWJh
c2VUcmVlRWxlbWVudC5maW5kT2JqZWN0U3RvcmVUcmVlRWxlbWVudChvYmplY3RTdG9yZU5hbWUp
OworICAgICAgICBvYmplY3RTdG9yZUVsZW1lbnQuc2VsZWN0KCk7CisKKyAgICAgICAgaW5kZXhl
ZERCTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuSW5kZXhlZERCTW9kZWwuRXZl
bnRUeXBlcy5PYmplY3RTdG9yZURhdGFMb2FkZWQsIG9iamVjdFN0b3JlRGF0YUxvYWRlZCk7Cisg
ICAgfQorCisgICAgZnVuY3Rpb24gb2JqZWN0U3RvcmVEYXRhTG9hZGVkKG9iamVjdFN0b3JlTW9k
ZWwpIHsKKyAgICAgICAgaW5kZXhlZERCTW9kZWwucmVtb3ZlRXZlbnRMaXN0ZW5lcihXZWJJbnNw
ZWN0b3IuSW5kZXhlZERCTW9kZWwuRXZlbnRUeXBlcy5PYmplY3RTdG9yZURhdGFMb2FkZWQpOwog
ICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiTmF2aWdhdGVkIHRvIGFub3RoZXIgc2Vj
dXJpdHkgb3JpZ2luLiIpOwogICAgICAgICBJbnNwZWN0b3JUZXN0Lm5hdmlnYXRlKHdpdGhvdXRJ
bmRleGVkREJVUkwsIG5hdmlnYXRlZEF3YXkpOwogICAgIH0K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>193609</attachid>
            <date>2013-03-18 11:04:32 -0700</date>
            <delta_ts>2013-03-18 12:58:57 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-101618-20130318110024.patch</filename>
            <type>text/plain</type>
            <size>3256</size>
            <attacher name="Alec Flett">alecflett</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MDU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTcxMmExMjYzOGQ3OGYy
ZjZiMzQ0YmU2MjZhMDhmODg5Yzk3NGRiNy4uZWIyMGYzMjQxNjRmMjU1YjEzMDQ5YmEwMzM5ZWUy
ZDA5NjMwMTI5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEzLTAzLTExICBBbGVj
IEZsZXR0ICA8YWxlY2ZsZXR0QGNocm9taXVtLm9yZz4KKworICAgICAgICBJbnNwZWN0b3I6IFtD
aHJvbWl1bV0gaHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5kZXhlZGRiL2RhdGFiYXNlLWRhdGEuaHRt
bCBBU1NFUlQgb24gV2luNyBmb2xsb3dpbmcgcjEzMzg1NQorICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxNjE4CisKKyAgICAgICAgRGVhY3RpdmF0ZSB0
cmFuc2FjdGlvbnMgY3JlYXRlZCBieSB0aGUgaW5zcGVjdG9yLCBiZWZvcmUKKyAgICAgICAgdGhl
eSBhcmUgcmVhY3RpdmF0ZWQgYnkgSW5kZXhlZERCLiBUaGlzIHB1dHMgdHJhbnNhY3Rpb25zCisg
ICAgICAgIGluIGFuIGlkZW50aWNhbCBzdGF0ZSBhcyB3aGVuIHRoZXkgYXJlIGNyZWF0ZWQgYnkg
c2NyaXB0cy4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg
ICBUZXN0OiBodHRwL3Rlc3RzL2luc3BlY3Rvci9pbmRleGVkZGIvZGF0YWJhc2UtZGF0YS5odG1s
CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9ySW5kZXhlZERCQWdlbnQuY3BwOiBNYWtl
IHRyYW5zYWN0aW9ucyBpbmFjdGl2ZSB1cG9uIGxlYXZpbmcgdGhlIGluc3BlY3RvciBjb2RlLgor
ICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9JbmRleGVk
REJNb2RlbC5qczogQWRkIG5ldyBldmVudCB0eXBlLgorICAgICAgICAoV2ViSW5zcGVjdG9yLklu
ZGV4ZWREQk1vZGVsLnByb3RvdHlwZS5sb2FkZWRDYWxsYmFjayk6IERpc3BhdGNoIGFuIGV2ZW50
IHdoZW5ldmVyIHRoZSBjdXJzb3IgaGFzIGZpbmlzaGVkIGxvYWRpbmcuCisgICAgICAgICogaW5z
cGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv
ci5JbmRleGVkREJUcmVlRWxlbWVudC5wcm90b3R5cGUuZmluZERhdGFiYXNlVHJlZUVsZW1lbnQp
OiBSZW5hbWVkIGZyb20gX2lkYkRhdGFiYXNlVHJlZUVsZW1lbnQuCisgICAgICAgIChXZWJJbnNw
ZWN0b3IuSURCRGF0YWJhc2VUcmVlRWxlbWVudC5wcm90b3R5cGUuZmluZE9iamVjdFN0b3JlVHJl
ZUVsZW1lbnQpOiBOZXcgdG8gZXhwb3NlIGZpbmRpbmcgb2JqZWN0U3RvcmVzIHRyZWUgbm9kZXMg
YnkgbmFtZS4KKwogMjAxMy0wMy0xOCAgQWxsYW4gU2FuZGZlbGQgSmVuc2VuICA8YWxsYW4uamVu
c2VuQGRpZ2lhLmNvbT4KIAogICAgICAgICBDbGVhbiB1cCBSZW5kZXJGcmFtZVNldDo6bm9kZUF0
UG9pbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbmRl
eGVkREJBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5kZXhl
ZERCQWdlbnQuY3BwCmluZGV4IDU3YzY3MjFiMTJhYTVhYjM5M2U5NzdkNjM1OWRiOGU4NjU0OWVl
OGIuLjY3MDYyMDhjMTMyY2NkZjQzZDE2NjQ2NTZiNzQ3ZjY4ZGQ2MWExM2QgMTAwNjQ0Ci0tLSBh
L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbmRleGVkREJBZ2VudC5jcHAKKysr
IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckluZGV4ZWREQkFnZW50LmNwcApA
QCAtNTUsNiArNTUsNyBAQAogI2luY2x1ZGUgIklEQk1ldGFkYXRhLmgiCiAjaW5jbHVkZSAiSURC
T2JqZWN0U3RvcmUuaCIKICNpbmNsdWRlICJJREJPcGVuREJSZXF1ZXN0LmgiCisjaW5jbHVkZSAi
SURCUGVuZGluZ1RyYW5zYWN0aW9uTW9uaXRvci5oIgogI2luY2x1ZGUgIklEQlJlcXVlc3QuaCIK
ICNpbmNsdWRlICJJREJUcmFuc2FjdGlvbi5oIgogI2luY2x1ZGUgIkluamVjdGVkU2NyaXB0Lmgi
CkBAIC0xODksNiArMTkwLDcgQEAgcHVibGljOgogCiAgICAgICAgIFJlZlB0cjxJREJEYXRhYmFz
ZT4gaWRiRGF0YWJhc2UgPSByZXF1ZXN0UmVzdWx0LT5pZGJEYXRhYmFzZSgpOwogICAgICAgICBt
X2V4ZWN1dGFibGVXaXRoRGF0YWJhc2UtPmV4ZWN1dGUoaWRiRGF0YWJhc2UpOworICAgICAgICBJ
REJQZW5kaW5nVHJhbnNhY3Rpb25Nb25pdG9yOjpkZWFjdGl2YXRlTmV3VHJhbnNhY3Rpb25zKCk7
CiAgICAgICAgIGlkYkRhdGFiYXNlLT5jbG9zZSgpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvTGF5
b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3Rz
L3BsYXRmb3JtL2Nocm9taXVtL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggMjU5ZmVlZjI4MjNiNDZm
NmZmY2M1Zjk5NzMxNDkzZDVkNDQ3MmZkYy4uMDQzMTIzNmMyOWRkOGJkYTAwMWU1OTA2ODE3Y2Q0
ZDg3ZGY3ODAzYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vVGVz
dEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS9UZXN0RXhw
ZWN0YXRpb25zCkBAIC00MTMxLDggKzQxMzEsNiBAQCB3ZWJraXQub3JnL2IvMTA2NTE4IFsgTGlv
biBNb3VudGFpbkxpb24gXSBwbGF0Zm9ybS9jaHJvbWl1bS92aXJ0dWFsL3NvZnR3YXJlY29tcAog
CiB3ZWJraXQub3JnL2IvMTAxNTM5IFsgTGludXggV2luIF0gZWRpdGluZy9leGVjQ29tbWFuZC9z
d2l0Y2gtbGlzdC10eXBlLXdpdGgtb3JwaGFuZWQtbGkuaHRtbCBbIEZhaWx1cmUgXQogCi13ZWJr
aXQub3JnL2IvMTAxNjE4IGh0dHAvdGVzdHMvaW5zcGVjdG9yL2luZGV4ZWRkYi9kYXRhYmFzZS1k
YXRhLmh0bWwgWyBQYXNzIENyYXNoIFNsb3cgXQotCiB3ZWJraXQub3JnL2IvOTAwMjIgZmFzdC9j
YW52YXMvY2FudmFzLXJlc2l6ZS1yZXNldC1waXhlbFJhdGlvLmh0bWwgWyBXb250Rml4IF0KIHdl
YmtpdC5vcmcvYi85MDAyMiBwbGF0Zm9ybS9jaHJvbWl1bS92aXJ0dWFsL2dwdS9mYXN0L2NhbnZh
cy9jYW52YXMtcmVzaXplLXJlc2V0LXBpeGVsUmF0aW8uaHRtbCBbIFdvbnRGaXggXQogd2Via2l0
Lm9yZy9iLzkwMDIyIGZhc3QvY2FudmFzL2NhbnZhcy1hcy1pbWFnZS1oaWRwaS5odG1sIFsgV29u
dEZpeCBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>193635</attachid>
            <date>2013-03-18 12:59:01 -0700</date>
            <delta_ts>2013-03-18 13:23:28 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-101618-20130318125453.patch</filename>
            <type>text/plain</type>
            <size>9895</size>
            <attacher name="Alec Flett">alecflett</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MDU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTcxMmExMjYzOGQ3OGYy
ZjZiMzQ0YmU2MjZhMDhmODg5Yzk3NGRiNy4uNTkwOTI5ZTZhZTJiOGVlMzY5ZTMwNDI3MWIzMTAy
MWMyYmVjMjk4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAzLTExICBBbGVj
IEZsZXR0ICA8YWxlY2ZsZXR0QGNocm9taXVtLm9yZz4KKworICAgICAgICBJbnNwZWN0b3I6IFtD
aHJvbWl1bV0gaHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5kZXhlZGRiL2RhdGFiYXNlLWRhdGEuaHRt
bCBBU1NFUlQgb24gV2luNyBmb2xsb3dpbmcgcjEzMzg1NQorICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxNjE4CisKKyAgICAgICAgRGVhY3RpdmF0ZSB0
cmFuc2FjdGlvbnMgY3JlYXRlZCBieSB0aGUgaW5zcGVjdG9yLCBiZWZvcmUKKyAgICAgICAgdGhl
eSBhcmUgcmVhY3RpdmF0ZWQgYnkgSW5kZXhlZERCLiBUaGlzIHB1dHMgdHJhbnNhY3Rpb25zCisg
ICAgICAgIGluIGFuIGlkZW50aWNhbCBzdGF0ZSBhcyB3aGVuIHRoZXkgYXJlIGNyZWF0ZWQgYnkg
c2NyaXB0cy4KKworICAgICAgICBSZXZpZXdlZCBieSBWc2V2b2xvZCBWbGFzb3YuCisKKyAgICAg
ICAgVGVzdDogTW9kaWZpZWQgaHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5kZXhlZGRiL3Jlc291cmNl
cy1wYW5lbC5odG1sIAorICAgICAgICB0byBzZWxlY3QgYW5kIG9iamVjdCBzdG9yZSBhbmQgd2Fp
dCBmb3IgaXQgdG8gbG9hZC4KKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JJbmRleGVk
REJBZ2VudC5jcHA6IE1ha2UgdHJhbnNhY3Rpb25zIGluYWN0aXZlIHVwb24gbGVhdmluZyB0aGUg
aW5zcGVjdG9yIGNvZGUuCisKIDIwMTMtMDMtMTggIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFs
bGFuLmplbnNlbkBkaWdpYS5jb20+CiAKICAgICAgICAgQ2xlYW4gdXAgUmVuZGVyRnJhbWVTZXQ6
Om5vZGVBdFBvaW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj
dG9ySW5kZXhlZERCQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv
ckluZGV4ZWREQkFnZW50LmNwcAppbmRleCA1N2M2NzIxYjEyYWE1YWIzOTNlOTc3ZDYzNTlkYjhl
ODY1NDllZThiLi42NzA2MjA4YzEzMmNjZGY0M2QxNjY0NjU2Yjc0N2Y2OGRkNjFhMTNkIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5kZXhlZERCQWdlbnQu
Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbmRleGVkREJBZ2Vu
dC5jcHAKQEAgLTU1LDYgKzU1LDcgQEAKICNpbmNsdWRlICJJREJNZXRhZGF0YS5oIgogI2luY2x1
ZGUgIklEQk9iamVjdFN0b3JlLmgiCiAjaW5jbHVkZSAiSURCT3BlbkRCUmVxdWVzdC5oIgorI2lu
Y2x1ZGUgIklEQlBlbmRpbmdUcmFuc2FjdGlvbk1vbml0b3IuaCIKICNpbmNsdWRlICJJREJSZXF1
ZXN0LmgiCiAjaW5jbHVkZSAiSURCVHJhbnNhY3Rpb24uaCIKICNpbmNsdWRlICJJbmplY3RlZFNj
cmlwdC5oIgpAQCAtMTg5LDYgKzE5MCw3IEBAIHB1YmxpYzoKIAogICAgICAgICBSZWZQdHI8SURC
RGF0YWJhc2U+IGlkYkRhdGFiYXNlID0gcmVxdWVzdFJlc3VsdC0+aWRiRGF0YWJhc2UoKTsKICAg
ICAgICAgbV9leGVjdXRhYmxlV2l0aERhdGFiYXNlLT5leGVjdXRlKGlkYkRhdGFiYXNlKTsKKyAg
ICAgICAgSURCUGVuZGluZ1RyYW5zYWN0aW9uTW9uaXRvcjo6ZGVhY3RpdmF0ZU5ld1RyYW5zYWN0
aW9ucygpOwogICAgICAgICBpZGJEYXRhYmFzZS0+Y2xvc2UoKTsKICAgICB9CiAKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5kZXhlZERCTW9kZWwuanMg
Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luZGV4ZWREQk1vZGVsLmpzCmlu
ZGV4IGE1MjU3YTI0YmNiYzM4ZGI0OGY0NzI2MjliZjMwYjEzYjEwOTZhYzQuLmQ3Y2VkNTE2MjY4
MjQ5ZDIyNDkxYzA4NDcyZWY5NGU0YzJjZmMxODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl
L2luc3BlY3Rvci9mcm9udC1lbmQvSW5kZXhlZERCTW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNv
cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbmRleGVkREJNb2RlbC5qcwpAQCAtMTM1LDcgKzEzNSw4
IEBAIFdlYkluc3BlY3Rvci5JbmRleGVkREJNb2RlbC5rZXlQYXRoU3RyaW5nRnJvbUlEQktleVBh
dGggPSBmdW5jdGlvbihpZGJLZXlQYXRoKQogV2ViSW5zcGVjdG9yLkluZGV4ZWREQk1vZGVsLkV2
ZW50VHlwZXMgPSB7CiAgICAgRGF0YWJhc2VBZGRlZDogIkRhdGFiYXNlQWRkZWQiLAogICAgIERh
dGFiYXNlUmVtb3ZlZDogIkRhdGFiYXNlUmVtb3ZlZCIsCi0gICAgRGF0YWJhc2VMb2FkZWQ6ICJE
YXRhYmFzZUxvYWRlZCIKKyAgICBEYXRhYmFzZUxvYWRlZDogIkRhdGFiYXNlTG9hZGVkIiwKKyAg
ICBPYmplY3RTdG9yZURhdGFMb2FkZWQ6ICJPYmplY3RTdG9yZURhdGFMb2FkZWQiLAogfQogCiBX
ZWJJbnNwZWN0b3IuSW5kZXhlZERCTW9kZWwucHJvdG90eXBlID0gewpAQCAtMjg5LDcgKzI5MCw3
IEBAIFdlYkluc3BlY3Rvci5JbmRleGVkREJNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAg
ICBpZiAoIXRoaXMuX2RhdGFiYXNlTmFtZXNCeVNlY3VyaXR5T3JpZ2luW2RhdGFiYXNlSWQuc2Vj
dXJpdHlPcmlnaW5dKQogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIHZhciBk
YXRhYmFzZU1vZGVsID0gbmV3IFdlYkluc3BlY3Rvci5JbmRleGVkREJNb2RlbC5EYXRhYmFzZShk
YXRhYmFzZUlkLCBkYXRhYmFzZVdpdGhPYmplY3RTdG9yZXMudmVyc2lvbiwgZGF0YWJhc2VXaXRo
T2JqZWN0U3RvcmVzLmludFZlcnNpb24pOwotICAgICAgICAgICAgdGhpcy5fZGF0YWJhc2VzLnB1
dChkYXRhYmFzZUlkLCBkYXRhYmFzZU1vZGVsKTsgCisgICAgICAgICAgICB0aGlzLl9kYXRhYmFz
ZXMucHV0KGRhdGFiYXNlSWQsIGRhdGFiYXNlTW9kZWwpOwogICAgICAgICAgICAgZm9yICh2YXIg
aSA9IDA7IGkgPCBkYXRhYmFzZVdpdGhPYmplY3RTdG9yZXMub2JqZWN0U3RvcmVzLmxlbmd0aDsg
KytpKSB7CiAgICAgICAgICAgICAgICAgdmFyIG9iamVjdFN0b3JlID0gZGF0YWJhc2VXaXRoT2Jq
ZWN0U3RvcmVzLm9iamVjdFN0b3Jlc1tpXTsKICAgICAgICAgICAgICAgICB2YXIgb2JqZWN0U3Rv
cmVJREJLZXlQYXRoID0gV2ViSW5zcGVjdG9yLkluZGV4ZWREQk1vZGVsLmlkYktleVBhdGhGcm9t
S2V5UGF0aChvYmplY3RTdG9yZS5rZXlQYXRoKTsKQEAgLTMxOSw3ICszMjAsMTQgQEAgV2ViSW5z
cGVjdG9yLkluZGV4ZWREQk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBsb2FkT2Jq
ZWN0U3RvcmVEYXRhOiBmdW5jdGlvbihkYXRhYmFzZUlkLCBvYmplY3RTdG9yZU5hbWUsIGlkYktl
eVJhbmdlLCBza2lwQ291bnQsIHBhZ2VTaXplLCBjYWxsYmFjaykKICAgICB7Ci0gICAgICAgIHRo
aXMuX3JlcXVlc3REYXRhKGRhdGFiYXNlSWQsIGRhdGFiYXNlSWQubmFtZSwgb2JqZWN0U3RvcmVO
YW1lLCAiIiwgaWRiS2V5UmFuZ2UsIHNraXBDb3VudCwgcGFnZVNpemUsIGNhbGxiYWNrKTsKKyAg
ICAgICAgdmFyIGRhdGFiYXNlTW9kZWwgPSB0aGlzLl9kYXRhYmFzZXMuZ2V0KGRhdGFiYXNlSWQp
OworICAgICAgICB2YXIgb2JqZWN0U3RvcmVNb2RlbCA9IGRhdGFiYXNlTW9kZWwub2JqZWN0U3Rv
cmVzW29iamVjdFN0b3JlTmFtZV07CisKKyAgICAgICAgZnVuY3Rpb24gbG9hZGVkQ2FsbGJhY2so
ZW50cmllcywgaGFzTW9yZSkgeworICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0
ZW5lcnMoV2ViSW5zcGVjdG9yLkluZGV4ZWREQk1vZGVsLkV2ZW50VHlwZXMuT2JqZWN0U3RvcmVE
YXRhTG9hZGVkLCBvYmplY3RTdG9yZU1vZGVsKTsKKyAgICAgICAgICAgIGNhbGxiYWNrKGVudHJp
ZXMsIGhhc01vcmUpOworICAgICAgICB9CisgICAgICAgIHRoaXMuX3JlcXVlc3REYXRhKGRhdGFi
YXNlSWQsIGRhdGFiYXNlSWQubmFtZSwgb2JqZWN0U3RvcmVOYW1lLCAiIiwgaWRiS2V5UmFuZ2Us
IHNraXBDb3VudCwgcGFnZVNpemUsIGxvYWRlZENhbGxiYWNrLmJpbmQodGhpcykpOwogICAgIH0s
CiAKICAgICAvKioKQEAgLTM1OSw5ICszNjcsMTAgQEAgV2ViSW5zcGVjdG9yLkluZGV4ZWREQk1v
ZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBjb25zb2xlLmVycm9yKCJJbmRleGVk
REJBZ2VudCBlcnJvcjogIiArIGVycm9yKTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAg
ICAgICAgICB9Ci0gICAgICAgICAgICAKKwogICAgICAgICAgICAgaWYgKCF0aGlzLl9kYXRhYmFz
ZU5hbWVzQnlTZWN1cml0eU9yaWdpbltkYXRhYmFzZUlkLnNlY3VyaXR5T3JpZ2luXSkKICAgICAg
ICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgICAgIHZhciBlbnRyaWVzID0gW107CiAgICAg
ICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGRhdGFFbnRyaWVzLmxlbmd0aDsgKytpKSB7CiAg
ICAgICAgICAgICAgICAgdmFyIGtleSA9IFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QuZnJvbVBh
eWxvYWQoZGF0YUVudHJpZXNbaV0ua2V5KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu
c3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw
ZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCmluZGV4IDg4MDYyNjljYzg5ZDJjMTU1
YmFmM2FjZTZhYTA0NDJiZjgwNDhjNjguLmE3Y2Y3NGU3YTU3MzBhYjE1MjlhZWM2NmIwNjgwYTdk
NTkwYmZiZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv
UmVzb3VyY2VzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu
ZC9SZXNvdXJjZXNQYW5lbC5qcwpAQCAtMTQ4Niw3ICsxNDg2LDcgQEAgV2ViSW5zcGVjdG9yLklu
ZGV4ZWREQlRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHZhciBkYXRh
YmFzZUlkID0gLyoqIEB0eXBlIHtXZWJJbnNwZWN0b3IuSW5kZXhlZERCTW9kZWwuRGF0YWJhc2VJ
ZH0gKi8gKGV2ZW50LmRhdGEpOwogCi0gICAgICAgIHZhciBpZGJEYXRhYmFzZVRyZWVFbGVtZW50
ID0gdGhpcy5faWRiRGF0YWJhc2VUcmVlRWxlbWVudChkYXRhYmFzZUlkKQorICAgICAgICB2YXIg
aWRiRGF0YWJhc2VUcmVlRWxlbWVudCA9IHRoaXMuZmluZERhdGFiYXNlVHJlZUVsZW1lbnQoZGF0
YWJhc2VJZCk7CiAgICAgICAgIGlmICghaWRiRGF0YWJhc2VUcmVlRWxlbWVudCkKICAgICAgICAg
ICAgIHJldHVybjsKIApAQCAtMTUwMiw3ICsxNTAyLDcgQEAgV2ViSW5zcGVjdG9yLkluZGV4ZWRE
QlRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHZhciBkYXRhYmFzZSA9
IC8qKiBAdHlwZSB7V2ViSW5zcGVjdG9yLkluZGV4ZWREQk1vZGVsLkRhdGFiYXNlfSAqLyAoZXZl
bnQuZGF0YSk7CiAKLSAgICAgICAgdmFyIGlkYkRhdGFiYXNlVHJlZUVsZW1lbnQgPSB0aGlzLl9p
ZGJEYXRhYmFzZVRyZWVFbGVtZW50KGRhdGFiYXNlLmRhdGFiYXNlSWQpCisgICAgICAgIHZhciBp
ZGJEYXRhYmFzZVRyZWVFbGVtZW50ID0gdGhpcy5maW5kRGF0YWJhc2VUcmVlRWxlbWVudChkYXRh
YmFzZS5kYXRhYmFzZUlkKTsKICAgICAgICAgaWYgKCFpZGJEYXRhYmFzZVRyZWVFbGVtZW50KQog
ICAgICAgICAgICAgcmV0dXJuOwogCkBAIC0xNTEzLDcgKzE1MTMsNyBAQCBXZWJJbnNwZWN0b3Iu
SW5kZXhlZERCVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAqIEBwYXJhbSB7V2ViSW5z
cGVjdG9yLkluZGV4ZWREQk1vZGVsLkRhdGFiYXNlSWR9IGRhdGFiYXNlSWQKICAgICAgKiBAcmV0
dXJuIHtXZWJJbnNwZWN0b3IuSURCRGF0YWJhc2VUcmVlRWxlbWVudH0KICAgICAgKi8KLSAgICBf
aWRiRGF0YWJhc2VUcmVlRWxlbWVudDogZnVuY3Rpb24oZGF0YWJhc2VJZCkKKyAgICBmaW5kRGF0
YWJhc2VUcmVlRWxlbWVudDogZnVuY3Rpb24oZGF0YWJhc2VJZCkKICAgICB7CiAgICAgICAgIHZh
ciBpbmRleCA9IC0xOwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX2lkYkRhdGFi
YXNlVHJlZUVsZW1lbnRzLmxlbmd0aDsgKytpKSB7CkBAIC0xNjQxLDYgKzE2NDEsMTMgQEAgV2Vi
SW5zcGVjdG9yLklEQkRhdGFiYXNlVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgIH0sCiAK
ICAgICAvKioKKyAgICAgKiBAcGFybWEge3N0cmluZ30gb2JqZWN0U3RvcmVOYW1lCisgICAgICov
CisgICAgZmluZE9iamVjdFN0b3JlVHJlZUVsZW1lbnQ6IGZ1bmN0aW9uKG9iamVjdFN0b3JlTmFt
ZSkgeworICAgICAgICByZXR1cm4gdGhpcy5faWRiT2JqZWN0U3RvcmVUcmVlRWxlbWVudHNbb2Jq
ZWN0U3RvcmVOYW1lXTsKKyAgICB9LAorCisgICAgLyoqCiAgICAgICogQHBhcmFtIHtXZWJJbnNw
ZWN0b3IuSW5kZXhlZERCTW9kZWwuRGF0YWJhc2V9IGRhdGFiYXNlCiAgICAgICovCiAgICAgdXBk
YXRlOiBmdW5jdGlvbihkYXRhYmFzZSkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv
ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA1MGE3MGYxOGZkMmE4MDUyODIxYTlhNWQy
MWEzZjJmYTcyOTliYTk5Li40YjMxOWIwNDYxMWZlNDcxMzZmYzk1YzAzYzhjZTIxNjVkN2FhNTg0
IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh
bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTMtMDMtMTEgIEFsZWMgRmxldHQgIDxhbGVjZmxl
dHRAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEluc3BlY3RvcjogW0Nocm9taXVtXSBodHRwL3Rl
c3RzL2luc3BlY3Rvci9pbmRleGVkZGIvZGF0YWJhc2UtZGF0YS5odG1sIEFTU0VSVCBvbiBXaW43
IGZvbGxvd2luZyByMTMzODU1CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df
YnVnLmNnaT9pZD0xMDE2MTgKKworICAgICAgICBSZXZpZXdlZCBieSBWc2V2b2xvZCBWbGFzb3Yu
CisKKyAgICAgICAgKiBodHRwL3Rlc3RzL2luc3BlY3Rvci9pbmRleGVkZGIvcmVzb3VyY2VzLXBh
bmVsLmh0bWw6IEFmdGVyIHRoZSBvYmplY3RTdG9yZSBpcyBjcmVhdGVkLCBzZWxlY3QgaXQgdG8g
dGVzdCBsb2FkaW5nLgorCiAyMDEzLTAzLTE4ICBLdW5paGlrbyBTYWthbW90byAgPGtzYWthbW90
b0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVGhlICdmb3Jtbm92YWxpZGF0ZScgYXR0cmlidXRl
IGRvZXNuJ3Qgd29yayBjb3JyZWN0bHkgb24gYnV0dG9uIGVsZW1lbnRzIHdpdGggY2hpbGQgZWxl
bWVudHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2luZGV4
ZWRkYi9yZXNvdXJjZXMtcGFuZWwuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVj
dG9yL2luZGV4ZWRkYi9yZXNvdXJjZXMtcGFuZWwuaHRtbAppbmRleCBhNTY3MTUxZWI3Y2UxYmJj
M2NiN2U4NTliNzZhN2MwZTBiZDIzYWZjLi5lODQ2M2Y2MTg0MjM2ZTVlMWY5ODk1ZTAwNmM5NDlh
ODdlOTM2ZGRmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9p
bmRleGVkZGIvcmVzb3VyY2VzLXBhbmVsLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0
cy9pbnNwZWN0b3IvaW5kZXhlZGRiL3Jlc291cmNlcy1wYW5lbC5odG1sCkBAIC04MSwxMCArODEs
MjEgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3Vy
Y2VzLmluZGV4ZWREQkxpc3RUcmVlRWxlbWVudC5yZWZyZXNoSW5kZXhlZERCKCk7CiAgICAgfQog
Ci0gICAgZnVuY3Rpb24gZGF0YWJhc2VMb2FkZWQoKQorICAgIGZ1bmN0aW9uIGRhdGFiYXNlTG9h
ZGVkKGV2ZW50KQogICAgIHsKICAgICAgICAgaW5kZXhlZERCTW9kZWwucmVtb3ZlRXZlbnRMaXN0
ZW5lcihXZWJJbnNwZWN0b3IuSW5kZXhlZERCTW9kZWwuRXZlbnRUeXBlcy5EYXRhYmFzZUxvYWRl
ZCwgZGF0YWJhc2VMb2FkZWQpOwogICAgICAgICBJbnNwZWN0b3JUZXN0LmR1bXBJbmRleGVkREJU
cmVlKCk7CisgICAgICAgIHZhciBkYXRhYmFzZSA9IC8qKiBAdHlwZSB7V2ViSW5zcGVjdG9yLklu
ZGV4ZWREQk1vZGVsLkRhdGFiYXNlfSAqLyAoZXZlbnQuZGF0YSk7CisgICAgICAgIHZhciBpbmRl
eGVkREJUcmVlID0gV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXMuaW5kZXhlZERCTGlzdFRy
ZWVFbGVtZW50OworICAgICAgICB2YXIgZGF0YWJhc2VUcmVlRWxlbWVudCA9IGluZGV4ZWREQlRy
ZWUuZmluZERhdGFiYXNlVHJlZUVsZW1lbnQoZGF0YWJhc2UuZGF0YWJhc2VJZCk7CisgICAgICAg
IHZhciBvYmplY3RTdG9yZUVsZW1lbnQgPSBkYXRhYmFzZVRyZWVFbGVtZW50LmZpbmRPYmplY3RT
dG9yZVRyZWVFbGVtZW50KG9iamVjdFN0b3JlTmFtZSk7CisgICAgICAgIG9iamVjdFN0b3JlRWxl
bWVudC5zZWxlY3QoKTsKKworICAgICAgICBpbmRleGVkREJNb2RlbC5hZGRFdmVudExpc3RlbmVy
KFdlYkluc3BlY3Rvci5JbmRleGVkREJNb2RlbC5FdmVudFR5cGVzLk9iamVjdFN0b3JlRGF0YUxv
YWRlZCwgb2JqZWN0U3RvcmVEYXRhTG9hZGVkKTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBvYmpl
Y3RTdG9yZURhdGFMb2FkZWQob2JqZWN0U3RvcmVNb2RlbCkgeworICAgICAgICBpbmRleGVkREJN
b2RlbC5yZW1vdmVFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5JbmRleGVkREJNb2RlbC5FdmVu
dFR5cGVzLk9iamVjdFN0b3JlRGF0YUxvYWRlZCk7CiAgICAgICAgIEluc3BlY3RvclRlc3QuYWRk
UmVzdWx0KCJOYXZpZ2F0ZWQgdG8gYW5vdGhlciBzZWN1cml0eSBvcmlnaW4uIik7CiAgICAgICAg
IEluc3BlY3RvclRlc3QubmF2aWdhdGUod2l0aG91dEluZGV4ZWREQlVSTCwgbmF2aWdhdGVkQXdh
eSk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vVGVz
dEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL1Rlc3RFeHBlY3Rh
dGlvbnMKaW5kZXggMjU5ZmVlZjI4MjNiNDZmNmZmY2M1Zjk5NzMxNDkzZDVkNDQ3MmZkYy4uMDQz
MTIzNmMyOWRkOGJkYTAwMWU1OTA2ODE3Y2Q0ZDg3ZGY3ODAzYiAxMDA2NDQKLS0tIGEvTGF5b3V0
VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0
cy9wbGF0Zm9ybS9jaHJvbWl1bS9UZXN0RXhwZWN0YXRpb25zCkBAIC00MTMxLDggKzQxMzEsNiBA
QCB3ZWJraXQub3JnL2IvMTA2NTE4IFsgTGlvbiBNb3VudGFpbkxpb24gXSBwbGF0Zm9ybS9jaHJv
bWl1bS92aXJ0dWFsL3NvZnR3YXJlY29tcAogCiB3ZWJraXQub3JnL2IvMTAxNTM5IFsgTGludXgg
V2luIF0gZWRpdGluZy9leGVjQ29tbWFuZC9zd2l0Y2gtbGlzdC10eXBlLXdpdGgtb3JwaGFuZWQt
bGkuaHRtbCBbIEZhaWx1cmUgXQogCi13ZWJraXQub3JnL2IvMTAxNjE4IGh0dHAvdGVzdHMvaW5z
cGVjdG9yL2luZGV4ZWRkYi9kYXRhYmFzZS1kYXRhLmh0bWwgWyBQYXNzIENyYXNoIFNsb3cgXQot
CiB3ZWJraXQub3JnL2IvOTAwMjIgZmFzdC9jYW52YXMvY2FudmFzLXJlc2l6ZS1yZXNldC1waXhl
bFJhdGlvLmh0bWwgWyBXb250Rml4IF0KIHdlYmtpdC5vcmcvYi85MDAyMiBwbGF0Zm9ybS9jaHJv
bWl1bS92aXJ0dWFsL2dwdS9mYXN0L2NhbnZhcy9jYW52YXMtcmVzaXplLXJlc2V0LXBpeGVsUmF0
aW8uaHRtbCBbIFdvbnRGaXggXQogd2Via2l0Lm9yZy9iLzkwMDIyIGZhc3QvY2FudmFzL2NhbnZh
cy1hcy1pbWFnZS1oaWRwaS5odG1sIFsgV29udEZpeCBdCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>193637</attachid>
            <date>2013-03-18 13:23:33 -0700</date>
            <delta_ts>2013-03-18 13:51:05 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-101618-20130318131925.patch</filename>
            <type>text/plain</type>
            <size>2734</size>
            <attacher name="Alec Flett">alecflett</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MDU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTcxMmExMjYzOGQ3OGYy
ZjZiMzQ0YmU2MjZhMDhmODg5Yzk3NGRiNy4uODEyZDA5N2VmNjI1MGVkZWUwMWVmMjE0OTYzYWM5
MWYyZDc5NWRhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTAzLTExICBBbGVj
IEZsZXR0ICA8YWxlY2ZsZXR0QGNocm9taXVtLm9yZz4KKworICAgICAgICBJbnNwZWN0b3I6IFtD
aHJvbWl1bV0gaHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5kZXhlZGRiL2RhdGFiYXNlLWRhdGEuaHRt
bCBBU1NFUlQgb24gV2luNyBmb2xsb3dpbmcgcjEzMzg1NQorICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxNjE4CisKKyAgICAgICAgRGVhY3RpdmF0ZSB0
cmFuc2FjdGlvbnMgY3JlYXRlZCBieSB0aGUgaW5zcGVjdG9yLCBiZWZvcmUKKyAgICAgICAgdGhl
eSBhcmUgcmVhY3RpdmF0ZWQgYnkgSW5kZXhlZERCLiBUaGlzIHB1dHMgdHJhbnNhY3Rpb25zCisg
ICAgICAgIGluIGFuIGlkZW50aWNhbCBzdGF0ZSBhcyB3aGVuIHRoZXkgYXJlIGNyZWF0ZWQgYnkg
c2NyaXB0cy4KKworICAgICAgICBSZXZpZXdlZCBieSBWc2V2b2xvZCBWbGFzb3YuCisKKyAgICAg
ICAgVGVzdDogaHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5kZXhlZGRiL2RhdGFiYXNlLWRhdGEuaHRt
bAorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckluZGV4ZWREQkFnZW50LmNwcDogTWFr
ZSB0cmFuc2FjdGlvbnMgaW5hY3RpdmUgdXBvbiBsZWF2aW5nIHRoZSBpbnNwZWN0b3IgY29kZS4K
KwogMjAxMy0wMy0xOCAgQWxsYW4gU2FuZGZlbGQgSmVuc2VuICA8YWxsYW4uamVuc2VuQGRpZ2lh
LmNvbT4KIAogICAgICAgICBDbGVhbiB1cCBSZW5kZXJGcmFtZVNldDo6bm9kZUF0UG9pbnQKZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbmRleGVkREJBZ2Vu
dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5kZXhlZERCQWdlbnQu
Y3BwCmluZGV4IDU3YzY3MjFiMTJhYTVhYjM5M2U5NzdkNjM1OWRiOGU4NjU0OWVlOGIuLjY3MDYy
MDhjMTMyY2NkZjQzZDE2NjQ2NTZiNzQ3ZjY4ZGQ2MWExM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbmRleGVkREJBZ2VudC5jcHAKKysrIGIvU291cmNl
L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckluZGV4ZWREQkFnZW50LmNwcApAQCAtNTUsNiAr
NTUsNyBAQAogI2luY2x1ZGUgIklEQk1ldGFkYXRhLmgiCiAjaW5jbHVkZSAiSURCT2JqZWN0U3Rv
cmUuaCIKICNpbmNsdWRlICJJREJPcGVuREJSZXF1ZXN0LmgiCisjaW5jbHVkZSAiSURCUGVuZGlu
Z1RyYW5zYWN0aW9uTW9uaXRvci5oIgogI2luY2x1ZGUgIklEQlJlcXVlc3QuaCIKICNpbmNsdWRl
ICJJREJUcmFuc2FjdGlvbi5oIgogI2luY2x1ZGUgIkluamVjdGVkU2NyaXB0LmgiCkBAIC0xODks
NiArMTkwLDcgQEAgcHVibGljOgogCiAgICAgICAgIFJlZlB0cjxJREJEYXRhYmFzZT4gaWRiRGF0
YWJhc2UgPSByZXF1ZXN0UmVzdWx0LT5pZGJEYXRhYmFzZSgpOwogICAgICAgICBtX2V4ZWN1dGFi
bGVXaXRoRGF0YWJhc2UtPmV4ZWN1dGUoaWRiRGF0YWJhc2UpOworICAgICAgICBJREJQZW5kaW5n
VHJhbnNhY3Rpb25Nb25pdG9yOjpkZWFjdGl2YXRlTmV3VHJhbnNhY3Rpb25zKCk7CiAgICAgICAg
IGlkYkRhdGFiYXNlLT5jbG9zZSgpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv
cGxhdGZvcm0vY2hyb21pdW0vVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3Jt
L2Nocm9taXVtL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggMjU5ZmVlZjI4MjNiNDZmNmZmY2M1Zjk5
NzMxNDkzZDVkNDQ3MmZkYy4uMDQzMTIzNmMyOWRkOGJkYTAwMWU1OTA2ODE3Y2Q0ZDg3ZGY3ODAz
YiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vVGVzdEV4cGVjdGF0
aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS9UZXN0RXhwZWN0YXRpb25z
CkBAIC00MTMxLDggKzQxMzEsNiBAQCB3ZWJraXQub3JnL2IvMTA2NTE4IFsgTGlvbiBNb3VudGFp
bkxpb24gXSBwbGF0Zm9ybS9jaHJvbWl1bS92aXJ0dWFsL3NvZnR3YXJlY29tcAogCiB3ZWJraXQu
b3JnL2IvMTAxNTM5IFsgTGludXggV2luIF0gZWRpdGluZy9leGVjQ29tbWFuZC9zd2l0Y2gtbGlz
dC10eXBlLXdpdGgtb3JwaGFuZWQtbGkuaHRtbCBbIEZhaWx1cmUgXQogCi13ZWJraXQub3JnL2Iv
MTAxNjE4IGh0dHAvdGVzdHMvaW5zcGVjdG9yL2luZGV4ZWRkYi9kYXRhYmFzZS1kYXRhLmh0bWwg
WyBQYXNzIENyYXNoIFNsb3cgXQotCiB3ZWJraXQub3JnL2IvOTAwMjIgZmFzdC9jYW52YXMvY2Fu
dmFzLXJlc2l6ZS1yZXNldC1waXhlbFJhdGlvLmh0bWwgWyBXb250Rml4IF0KIHdlYmtpdC5vcmcv
Yi85MDAyMiBwbGF0Zm9ybS9jaHJvbWl1bS92aXJ0dWFsL2dwdS9mYXN0L2NhbnZhcy9jYW52YXMt
cmVzaXplLXJlc2V0LXBpeGVsUmF0aW8uaHRtbCBbIFdvbnRGaXggXQogd2Via2l0Lm9yZy9iLzkw
MDIyIGZhc3QvY2FudmFzL2NhbnZhcy1hcy1pbWFnZS1oaWRwaS5odG1sIFsgV29udEZpeCBdCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>