/[packages]/updates/5/java-1.8.0-openjdk/current/SOURCES/8049226-pr2960.patch
ViewVC logotype

Diff of /updates/5/java-1.8.0-openjdk/current/SOURCES/8049226-pr2960.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1043835 by luigiwalser, Thu Jul 28 17:26:58 2016 UTC revision 1043836 by luigiwalser, Thu Jul 28 17:32:46 2016 UTC
# Line 1  Line 1 
1  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"  # HG changeset patch
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">  
 <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>  
 <head>  
 <title>rpms/java-1.8.0-openjdk.git - java-1.8.0-openjdk</title>  
 <meta name='generator' content='cgit v0.12'/>  
 <meta name='robots' content='index, nofollow'/>  
 <link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/>  
 <link rel='shortcut icon' href='/favicon.ico'/>  
 <link rel='alternate' title='Atom feed' href='http://pkgs.fedoraproject.org/cgit/rpms/java-1.8.0-openjdk.git/atom/8049226-pr2960.patch?h=f24' type='application/atom+xml'/>  
 <link rel='vcs-git' href='git://pkgs.fedoraproject.org/rpms/java-1.8.0-openjdk.git' title='rpms/java-1.8.0-openjdk.git Git repository'/>  
 <link rel='vcs-git' href='ssh://pkgs.fedoraproject.org/rpms/java-1.8.0-openjdk.git' title='rpms/java-1.8.0-openjdk.git Git repository'/>  
 <link rel='vcs-git' href='http://pkgs.fedoraproject.org/git/rpms/java-1.8.0-openjdk.git' title='rpms/java-1.8.0-openjdk.git Git repository'/>  
 </head>  
 <body>  
 <script src="https://apps.fedoraproject.org/fedmenu/js/jquery-1.11.2.min.js"></script>  
 <script src="https://apps.fedoraproject.org/fedmenu/js/fedmenu.js"></script>  
   
 <script>  
     var base = 'https://apps.fedoraproject.org/';  
     var tokens = window.location.href.split('/');  
   var repo = null;  
   if (tokens.length > 4 && tokens[4] != '') {  
     repo = tokens[4].split('.')[0];  
   }  
   fedmenu({  
       'url': base + 'js/data.js',  
       'mimeType': 'application/javascript',  
       'position': 'bottom-right',  
       'package': repo,  
   });  
 </script>  
 <div id='cgit'><table id='header'>  
 <tr>  
 <td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td>  
 <td class='main'><a href='/cgit/'>index</a> : <a title='rpms/java-1.8.0-openjdk.git' href='/cgit/rpms/java-1.8.0-openjdk.git/'>rpms/java-1.8.0-openjdk.git</a></td><td class='form'><form method='get' action=''>  
 <select name='h' onchange='this.form.submit();'>  
 <option value='f19'>f19</option>  
 <option value='f20'>f20</option>  
 <option value='f21'>f21</option>  
 <option value='f22'>f22</option>  
 <option value='f23'>f23</option>  
 <option value='f24' selected='selected'>f24</option>  
 <option value='f25'>f25</option>  
 <option value='master'>master</option>  
 </select> <input type='submit' name='' value='switch'/></form></td></tr>  
 <tr><td class='sub'>java-1.8.0-openjdk</td><td class='sub right'>Jon Ciesla</td></tr></table>  
 <table class='tabs'><tr><td>  
 <a href='/cgit/rpms/java-1.8.0-openjdk.git/?h=f24'>summary</a><a href='/cgit/rpms/java-1.8.0-openjdk.git/refs/?h=f24'>refs</a><a href='/cgit/rpms/java-1.8.0-openjdk.git/log/8049226-pr2960.patch?h=f24'>log</a><a class='active' href='/cgit/rpms/java-1.8.0-openjdk.git/tree/8049226-pr2960.patch?h=f24'>tree</a><a href='/cgit/rpms/java-1.8.0-openjdk.git/commit/8049226-pr2960.patch?h=f24'>commit</a><a href='/cgit/rpms/java-1.8.0-openjdk.git/diff/8049226-pr2960.patch?h=f24'>diff</a><a href='/cgit/rpms/java-1.8.0-openjdk.git/stats/8049226-pr2960.patch?h=f24'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/rpms/java-1.8.0-openjdk.git/log/8049226-pr2960.patch'>  
 <input type='hidden' name='h' value='f24'/><select name='qt'>  
 <option value='grep'>log msg</option>  
 <option value='author'>author</option>  
 <option value='committer'>committer</option>  
 <option value='range'>range</option>  
 </select>  
 <input class='txt' type='text' size='10' name='q' value=''/>  
 <input type='submit' value='search'/>  
 </form>  
 </td></tr></table>  
 <div class='path'>path: <a href='/cgit/rpms/java-1.8.0-openjdk.git/tree/?h=f24'>root</a>/<a href='/cgit/rpms/java-1.8.0-openjdk.git/tree/8049226-pr2960.patch?h=f24'>8049226-pr2960.patch</a></div><div class='content'>blob: 0f6bdf8ca3544f579d0d136629086989d2b2189b (<a href='/cgit/rpms/java-1.8.0-openjdk.git/plain/8049226-pr2960.patch?h=f24'>plain</a>)  
 <table summary='blob content' class='blob'>  
 <tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>  
 <a id='n2' href='#n2'>2</a>  
 <a id='n3' href='#n3'>3</a>  
 <a id='n4' href='#n4'>4</a>  
 <a id='n5' href='#n5'>5</a>  
 <a id='n6' href='#n6'>6</a>  
 <a id='n7' href='#n7'>7</a>  
 <a id='n8' href='#n8'>8</a>  
 <a id='n9' href='#n9'>9</a>  
 <a id='n10' href='#n10'>10</a>  
 <a id='n11' href='#n11'>11</a>  
 <a id='n12' href='#n12'>12</a>  
 <a id='n13' href='#n13'>13</a>  
 <a id='n14' href='#n14'>14</a>  
 <a id='n15' href='#n15'>15</a>  
 <a id='n16' href='#n16'>16</a>  
 <a id='n17' href='#n17'>17</a>  
 <a id='n18' href='#n18'>18</a>  
 <a id='n19' href='#n19'>19</a>  
 <a id='n20' href='#n20'>20</a>  
 <a id='n21' href='#n21'>21</a>  
 <a id='n22' href='#n22'>22</a>  
 <a id='n23' href='#n23'>23</a>  
 <a id='n24' href='#n24'>24</a>  
 <a id='n25' href='#n25'>25</a>  
 <a id='n26' href='#n26'>26</a>  
 <a id='n27' href='#n27'>27</a>  
 <a id='n28' href='#n28'>28</a>  
 <a id='n29' href='#n29'>29</a>  
 <a id='n30' href='#n30'>30</a>  
 <a id='n31' href='#n31'>31</a>  
 <a id='n32' href='#n32'>32</a>  
 <a id='n33' href='#n33'>33</a>  
 <a id='n34' href='#n34'>34</a>  
 <a id='n35' href='#n35'>35</a>  
 <a id='n36' href='#n36'>36</a>  
 <a id='n37' href='#n37'>37</a>  
 <a id='n38' href='#n38'>38</a>  
 <a id='n39' href='#n39'>39</a>  
 <a id='n40' href='#n40'>40</a>  
 <a id='n41' href='#n41'>41</a>  
 <a id='n42' href='#n42'>42</a>  
 <a id='n43' href='#n43'>43</a>  
 <a id='n44' href='#n44'>44</a>  
 <a id='n45' href='#n45'>45</a>  
 <a id='n46' href='#n46'>46</a>  
 <a id='n47' href='#n47'>47</a>  
 <a id='n48' href='#n48'>48</a>  
 <a id='n49' href='#n49'>49</a>  
 <a id='n50' href='#n50'>50</a>  
 <a id='n51' href='#n51'>51</a>  
 <a id='n52' href='#n52'>52</a>  
 <a id='n53' href='#n53'>53</a>  
 <a id='n54' href='#n54'>54</a>  
 <a id='n55' href='#n55'>55</a>  
 <a id='n56' href='#n56'>56</a>  
 <a id='n57' href='#n57'>57</a>  
 <a id='n58' href='#n58'>58</a>  
 <a id='n59' href='#n59'>59</a>  
 <a id='n60' href='#n60'>60</a>  
 <a id='n61' href='#n61'>61</a>  
 <a id='n62' href='#n62'>62</a>  
 <a id='n63' href='#n63'>63</a>  
 <a id='n64' href='#n64'>64</a>  
 <a id='n65' href='#n65'>65</a>  
 <a id='n66' href='#n66'>66</a>  
 <a id='n67' href='#n67'>67</a>  
 <a id='n68' href='#n68'>68</a>  
 <a id='n69' href='#n69'>69</a>  
 <a id='n70' href='#n70'>70</a>  
 <a id='n71' href='#n71'>71</a>  
 <a id='n72' href='#n72'>72</a>  
 <a id='n73' href='#n73'>73</a>  
 <a id='n74' href='#n74'>74</a>  
 <a id='n75' href='#n75'>75</a>  
 <a id='n76' href='#n76'>76</a>  
 <a id='n77' href='#n77'>77</a>  
 <a id='n78' href='#n78'>78</a>  
 <a id='n79' href='#n79'>79</a>  
 <a id='n80' href='#n80'>80</a>  
 <a id='n81' href='#n81'>81</a>  
 <a id='n82' href='#n82'>82</a>  
 <a id='n83' href='#n83'>83</a>  
 <a id='n84' href='#n84'>84</a>  
 <a id='n85' href='#n85'>85</a>  
 <a id='n86' href='#n86'>86</a>  
 <a id='n87' href='#n87'>87</a>  
 <a id='n88' href='#n88'>88</a>  
 <a id='n89' href='#n89'>89</a>  
 <a id='n90' href='#n90'>90</a>  
 <a id='n91' href='#n91'>91</a>  
 <a id='n92' href='#n92'>92</a>  
 <a id='n93' href='#n93'>93</a>  
 <a id='n94' href='#n94'>94</a>  
 <a id='n95' href='#n95'>95</a>  
 <a id='n96' href='#n96'>96</a>  
 <a id='n97' href='#n97'>97</a>  
 <a id='n98' href='#n98'>98</a>  
 <a id='n99' href='#n99'>99</a>  
 <a id='n100' href='#n100'>100</a>  
 <a id='n101' href='#n101'>101</a>  
 <a id='n102' href='#n102'>102</a>  
 <a id='n103' href='#n103'>103</a>  
 <a id='n104' href='#n104'>104</a>  
 <a id='n105' href='#n105'>105</a>  
 <a id='n106' href='#n106'>106</a>  
 <a id='n107' href='#n107'>107</a>  
 <a id='n108' href='#n108'>108</a>  
 <a id='n109' href='#n109'>109</a>  
 <a id='n110' href='#n110'>110</a>  
 <a id='n111' href='#n111'>111</a>  
 <a id='n112' href='#n112'>112</a>  
 <a id='n113' href='#n113'>113</a>  
 <a id='n114' href='#n114'>114</a>  
 <a id='n115' href='#n115'>115</a>  
 <a id='n116' href='#n116'>116</a>  
 <a id='n117' href='#n117'>117</a>  
 <a id='n118' href='#n118'>118</a>  
 <a id='n119' href='#n119'>119</a>  
 <a id='n120' href='#n120'>120</a>  
 <a id='n121' href='#n121'>121</a>  
 <a id='n122' href='#n122'>122</a>  
 <a id='n123' href='#n123'>123</a>  
 </pre></td>  
 <td class='lines'><pre><code># HG changeset patch  
2  # User dsamersoff  # User dsamersoff
3  # Date 1409228402 25200  # Date 1409228402 25200
4  #      Thu Aug 28 05:20:02 2014 -0700  #      Thu Aug 28 05:20:02 2014 -0700
# Line 225  diff -r 13411144d46b -r f4c9545cd8a5 src Line 40  diff -r 13411144d46b -r f4c9545cd8a5 src
40  +                                               ((msg == NULL) ? "" : msg)));  +                                               ((msg == NULL) ? "" : msg)));
41  +  +
42  +    // coredump requested by command line. Keep JVMTI data dirty  +    // coredump requested by command line. Keep JVMTI data dirty
43  +    if (error != JVMTI_ERROR_NONE &amp;&amp; docoredump) {  +    if (error != JVMTI_ERROR_NONE && docoredump) {
44  +        LOG_MISC(("Dumping core as requested by command line"));  +        LOG_MISC(("Dumping core as requested by command line"));
45  +        finish_logging();  +        finish_logging();
46  +        abort();  +        abort();
# Line 240  diff -r 13411144d46b -r f4c9545cd8a5 src Line 55  diff -r 13411144d46b -r f4c9545cd8a5 src
55  -  -
56  +    // Cleanup the JVMTI if we have one  +    // Cleanup the JVMTI if we have one
57       if (gdata != NULL) {       if (gdata != NULL) {
58           gdata-&gt;vmDead = JNI_TRUE;           gdata->vmDead = JNI_TRUE;
59  -  -
60  -        /* Let's try and cleanup the JVMTI, if we even have one */  -        /* Let's try and cleanup the JVMTI, if we even have one */
61  -        if ( gdata-&gt;jvmti != NULL ) {  -        if ( gdata->jvmti != NULL ) {
62  -            /* Dispose of jvmti (gdata-&gt;jvmti becomes NULL) */  -            /* Dispose of jvmti (gdata->jvmti becomes NULL) */
63  +        if (gdata-&gt;jvmti != NULL) {  +        if (gdata->jvmti != NULL) {
64  +            // Dispose of jvmti (gdata-&gt;jvmti becomes NULL)  +            // Dispose of jvmti (gdata->jvmti becomes NULL)
65               disposeEnvironment(gdata-&gt;jvmti);               disposeEnvironment(gdata->jvmti);
66           }           }
67       }       }
68    
# Line 306  diff -r 13411144d46b -r f4c9545cd8a5 src Line 121  diff -r 13411144d46b -r f4c9545cd8a5 src
121    
122   #define LOG_NULL ((void)0)   #define LOG_NULL ((void)0)
123    
 </code></pre></td></tr></table>  
 </div> <!-- class=content -->  
 <div class='footer'>generated by <a href='http://git.zx2c4.com/cgit/about/'>cgit v0.12</a> at 2016-07-28 17:00:59 (GMT)</div>  
 </div> <!-- id=cgit -->  
 </body>  
 </html>  

Legend:
Removed from v.1043835  
changed lines
  Added in v.1043836

  ViewVC Help
Powered by ViewVC 1.1.30