'[Opendj-dev] [10848] branches/b2.6-sdk: Partial fix for OPENDJ-1500: upgrade SDK to Grizzly 2.3.14'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       forgerock-opendj-dev
Subject:    [Opendj-dev] [10848] branches/b2.6-sdk: Partial fix for OPENDJ-1500: upgrade SDK to Grizzly 2.3.14
From:       noreply () forgerock ! org
Date:       2014-06-30 21:58:25
Message-ID: 20140630215825.CB03D41337 () sources ! internal ! forgerock ! com
[Download RAW message or body]

[Attachment #2 (text/html)]

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[10848] branches/b2.6-sdk: Partial fix for OPENDJ-1500: upgrade SDK to Grizzly \
2.3.14</title> </head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt;  } #msg dl a { font-weight: \
bold} #msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
 #patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
                .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://sources.forgerock.org/changelog/opendj/?cs=10848">10848</a></dd> \
<dt>Author</dt> <dd>matthew</dd> <dt>Date</dt> <dd>2014-06-30 22:58:25 +0100 (Mon, 30 \
Jun 2014)</dd> </dl>

<h3>Log Message</h3>
<pre>Partial fix for <a \
href="https://bugster.forgerock.org/jira/browse/OPENDJ-1500">OPENDJ-1500</a>: upgrade \
SDK to Grizzly 2.3.14</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesb26sdkopendjldapsdksrcmainjavacomforgerockopendjldapDefaultTCPNI \
OTransportjava">branches/b2.6-sdk/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/DefaultTCPNIOTransport.java</a></li>
 <li><a href="#branchesb26sdkpomxml">branches/b2.6-sdk/pom.xml</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesb26sdkopendjldapsdksrcmainjavacomforgerockopendjldapDefaultTCPNIOTransportjava"></a>
 <div class="modfile"><h4>Modified: \
branches/b2.6-sdk/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/DefaultTCPNIOTransport.java \
(10847 => 10848)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/b2.6-sdk/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/DefaultTCPNIOTransport.java	2014-06-30 \
                21:55:37 UTC (rev 10847)
+++ branches/b2.6-sdk/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/DefaultTCPNIOTransport.java	2014-06-30 \
21:58:25 UTC (rev 10848) </span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx">  *
</span><span class="cx">  *
</span><span class="cx">  *      Copyright 2010 Sun Microsystems, Inc.
</span><del>- *      Portions copyright 2011-2013 ForgeRock AS
</del><ins>+ *      Portions copyright 2011-2014 ForgeRock AS
</ins><span class="cx">  */
</span><span class="cx"> 
</span><span class="cx"> package com.forgerock.opendj.ldap;
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> import \
org.glassfish.grizzly.nio.transport.TCPNIOTransportBuilder; </span><span class="cx"> \
import org.glassfish.grizzly.strategies.SameThreadIOStrategy; </span><span \
class="cx"> import org.glassfish.grizzly.strategies.WorkerThreadIOStrategy; \
</span><ins>+import org.glassfish.grizzly.threadpool.ThreadPoolConfig; </ins><span \
class="cx">  </span><span class="cx"> import \
com.forgerock.opendj.util.ReferenceCountedObject; </span><span class="cx"> 
</span><span class="lines">@@ -54,7 +55,7 @@
</span><span class="cx">     @Override
</span><span class="cx">     protected void destroyInstance(final TCPNIOTransport \
instance) { </span><span class="cx">         try {
</span><del>-            instance.stop();
</del><ins>+            instance.shutdownNow();
</ins><span class="cx">         } catch (final IOException e) {
</span><span class="cx">             DEBUG_LOG.log(Level.WARNING,
</span><span class="cx">                     &quot;An error occurred while shutting \
down the Grizzly transport&quot;, e.getMessage()); </span><span class="lines">@@ \
-102,10 +103,10 @@ </span><span class="cx">             selectorThreadCount =
</span><span class="cx">                     useWorkerThreadStrategy ? Math.max(2, \
cpus / 4) : Math.max(5, (cpus / 2) - 1); </span><span class="cx">         }
</span><ins>+        \
builder.setSelectorThreadPoolConfig(ThreadPoolConfig.defaultConfig().setCorePoolSize( \
+                selectorThreadCount).setMaxPoolSize(selectorThreadCount).setPoolName(
 +                &quot;OpenDJ LDAP SDK Grizzly selector thread&quot;));
</ins><span class="cx"> 
</span><del>-        \
builder.getSelectorThreadPoolConfig().setCorePoolSize(selectorThreadCount).setMaxPoolSize(
                
-                selectorThreadCount).setPoolName(&quot;OpenDJ LDAP SDK Grizzly \
                selector thread&quot;);
-
</del><span class="cx">         // Calculate the number of worker threads.
</span><span class="cx">         if (builder.getWorkerThreadPoolConfig() != null) {
</span><span class="cx">             final String workersStr = \
System.getProperty(&quot;org.forgerock.opendj.transport.workers&quot;); </span><span \
class="lines">@@ -116,9 +117,9 @@ </span><span class="cx">             } else {
</span><span class="cx">                 workerThreadCount = useWorkerThreadStrategy \
? Math.max(5, (cpus * 2)) : 0; </span><span class="cx">             }
</span><del>-
-            builder.getWorkerThreadPoolConfig().setCorePoolSize(workerThreadCount).setMaxPoolSize(
                
-                    workerThreadCount).setPoolName(&quot;OpenDJ LDAP SDK Grizzly \
worker thread&quot;); </del><ins>+            \
builder.setWorkerThreadPoolConfig(ThreadPoolConfig.defaultConfig().setCorePoolSize( + \
workerThreadCount).setMaxPoolSize(workerThreadCount).setPoolName( +                   \
&quot;OpenDJ LDAP SDK Grizzly worker thread&quot;)); </ins><span class="cx">         \
} </span><span class="cx"> 
</span><span class="cx">         // Parse IO related options.
</span></span></pre></div>
<a id="branchesb26sdkpomxml"></a>
<div class="modfile"><h4>Modified: branches/b2.6-sdk/pom.xml (10847 => 10848)</h4>
<pre class="diff"><span>
<span class="info">--- branches/b2.6-sdk/pom.xml	2014-06-30 21:55:37 UTC (rev 10847)
+++ branches/b2.6-sdk/pom.xml	2014-06-30 21:58:25 UTC (rev 10848)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx">     \
&lt;sdkDocTargetVersion&gt;2.6.7&lt;/sdkDocTargetVersion&gt; </span><span class="cx"> \
&lt;siteDistributionURL&gt;scp://forgerock.org/var/www/vhosts/opendj.forgerock.org/httpdocs&lt;/siteDistributionURL&gt;
 </span><span class="cx">     \
&lt;i18nFrameworkVersion&gt;1.4.0&lt;/i18nFrameworkVersion&gt; </span><del>-    \
&lt;grizzlyFrameworkVersion&gt;2.3.4&lt;/grizzlyFrameworkVersion&gt; </del><ins>+    \
&lt;grizzlyFrameworkVersion&gt;2.3.14&lt;/grizzlyFrameworkVersion&gt; </ins><span \
class="cx">     &lt;forgerockRestVersion&gt;2.0.2&lt;/forgerockRestVersion&gt; \
</span><span class="cx">     &lt;gaId&gt;UA-23412190-8&lt;/gaId&gt; </span><span \
class="cx">     &lt;!-- OSGi bundles properties --&gt; </span></span></pre>
</div>
</div>
<div id="footer">Copyright (c) by ForgeRock. All rights reserved.</div>

</body>
</html>


_______________________________________________
OpenDJ-dev mailing list
OpenDJ-dev@forgerock.org
https://lists.forgerock.org/mailman/listinfo/opendj-dev


[prev in list] [next in list] [prev in thread] [next in thread]