From c4be6d3b045759707d56b96e9e8fb5a67712bd0b Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 23 Sep 2013 16:12:25 +0000
Subject: [PATCH] Fix OPENDJ-1153: Upgrade OpenDJ SDK to Grizzly 2.3.6
---
opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/DefaultTCPNIOTransport.java | 13 ++++++++-----
opendj-sdk/opendj3/pom.xml | 2 +-
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/DefaultTCPNIOTransport.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/DefaultTCPNIOTransport.java
index 9f7c413..6518557 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/DefaultTCPNIOTransport.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/DefaultTCPNIOTransport.java
@@ -36,6 +36,7 @@
import org.glassfish.grizzly.nio.transport.TCPNIOTransportBuilder;
import org.glassfish.grizzly.strategies.SameThreadIOStrategy;
import org.glassfish.grizzly.strategies.WorkerThreadIOStrategy;
+import org.glassfish.grizzly.threadpool.ThreadPoolConfig;
import com.forgerock.opendj.util.ReferenceCountedObject;
@@ -54,7 +55,7 @@
@Override
protected void destroyInstance(final TCPNIOTransport instance) {
try {
- instance.stop();
+ instance.shutdownNow();
} catch (final IOException e) {
DEBUG_LOG.log(Level.WARNING,
"An error occurred while shutting down the Grizzly transport", e.getMessage());
@@ -103,8 +104,9 @@
useWorkerThreadStrategy ? Math.max(2, cpus / 4) : Math.max(5, (cpus / 2) - 1);
}
- builder.getSelectorThreadPoolConfig().setCorePoolSize(selectorThreadCount).setMaxPoolSize(
- selectorThreadCount).setPoolName("OpenDJ LDAP SDK Grizzly selector thread");
+ builder.setSelectorThreadPoolConfig(ThreadPoolConfig.defaultConfig().setCorePoolSize(
+ selectorThreadCount).setMaxPoolSize(selectorThreadCount).setPoolName(
+ "OpenDJ LDAP SDK Grizzly selector thread"));
// Calculate the number of worker threads.
if (builder.getWorkerThreadPoolConfig() != null) {
@@ -117,8 +119,9 @@
workerThreadCount = useWorkerThreadStrategy ? Math.max(5, (cpus * 2)) : 0;
}
- builder.getWorkerThreadPoolConfig().setCorePoolSize(workerThreadCount).setMaxPoolSize(
- workerThreadCount).setPoolName("OpenDJ LDAP SDK Grizzly worker thread");
+ builder.setWorkerThreadPoolConfig(ThreadPoolConfig.defaultConfig().setCorePoolSize(
+ workerThreadCount).setMaxPoolSize(workerThreadCount).setPoolName(
+ "OpenDJ LDAP SDK Grizzly worker thread"));
}
// Parse IO related options.
diff --git a/opendj-sdk/opendj3/pom.xml b/opendj-sdk/opendj3/pom.xml
index bbe77d4..c7f2cd9 100644
--- a/opendj-sdk/opendj3/pom.xml
+++ b/opendj-sdk/opendj3/pom.xml
@@ -105,7 +105,7 @@
<sdkDocTargetVersion>${docTargetVersion}</sdkDocTargetVersion>
<siteDistributionURL>scp://forgerock.org/var/www/vhosts/opendj.forgerock.org/httpdocs</siteDistributionURL>
<i18nFrameworkVersion>1.4.0</i18nFrameworkVersion>
- <grizzlyFrameworkVersion>2.3.4</grizzlyFrameworkVersion>
+ <grizzlyFrameworkVersion>2.3.6</grizzlyFrameworkVersion>
<forgerockRestVersion>2.0.1-SNAPSHOT</forgerockRestVersion>
<gaId>UA-23412190-8</gaId>
<!-- OSGi bundles properties -->
--
Gitblit v1.10.0