jboss-remoting-commits
April 2008
jboss-remoting-commits@lists.jboss.org
- 1 participants
- 281 discussions
JBoss Remoting SVN: r4017 - in remoting3/trunk: http-urlconnection/src/main/java/org/jboss/cx/remoting/http/urlconnection and 1 other directory.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2008-04-18 17:37:37 -0400 (Fri, 18 Apr 2008)
New Revision: 4017
Added:
remoting3/trunk/http-urlconnection/src/main/java/org/jboss/cx/remoting/http/urlconnection/AbstractHttpUrlChannel.java
remoting3/trunk/http-urlconnection/src/main/java/org/jboss/cx/remoting/http/urlconnection/HttpUrlChannel.java
remoting3/trunk/http-urlconnection/src/main/java/org/jboss/cx/remoting/http/urlconnection/HttpsUrlChannel.java
Removed:
remoting3/trunk/http-urlconnection/src/main/java/org/jboss/cx/remoting/http/urlconnection/HttpUrlChannel.java
Modified:
remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/cookie/CookieClientSession.java
Log:
More progress towards HTTP client connection
Modified: remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/cookie/CookieClientSession.java
===================================================================
--- remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/cookie/CookieClientSession.java 2008-04-18 21:37:17 UTC (rev 4016)
+++ remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/cookie/CookieClientSession.java 2008-04-18 21:37:37 UTC (rev 4017)
@@ -38,7 +38,7 @@
* @param domain the request domain
* @param path the request path (sans file, with trailing slash)
* @param secureRequest {@code true} if the request will use the {@code https} protocol
- * @return the cookie header value
+ * @return the cookie header value, or {@code null} if there's no cookies to set
*/
public String getCookieHeader(String domain, String path, boolean secureRequest) {
final SortedMap<Cookie.Key, Cookie> sortedValidatedCookies = new TreeMap<Cookie.Key, Cookie>();
Copied: remoting3/trunk/http-urlconnection/src/main/java/org/jboss/cx/remoting/http/urlconnection/AbstractHttpUrlChannel.java (from rev 4015, remoting3/trunk/http-urlconnection/src/main/java/org/jboss/cx/remoting/http/urlconnection/HttpUrlChannel.java)
===================================================================
--- remoting3/trunk/http-urlconnection/src/main/java/org/jboss/cx/remoting/http/urlconnection/AbstractHttpUrlChannel.java (rev 0)
+++ remoting3/trunk/http-urlconnection/src/main/java/org/jboss/cx/remoting/http/urlconnection/AbstractHttpUrlChannel.java 2008-04-18 21:37:37 UTC (rev 4017)
@@ -0,0 +1,204 @@
+package org.jboss.cx.remoting.http.urlconnection;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import org.jboss.cx.remoting.http.cookie.CookieClientSession;
+import org.jboss.cx.remoting.http.spi.AbstractIncomingHttpMessage;
+import org.jboss.cx.remoting.http.spi.OutgoingHttpMessage;
+import org.jboss.cx.remoting.http.spi.RemotingHttpSessionContext;
+import org.jboss.cx.remoting.log.Logger;
+import org.jboss.cx.remoting.util.AbstractOutputStreamByteMessageOutput;
+import org.jboss.cx.remoting.util.ByteMessageInput;
+import org.jboss.cx.remoting.util.InputStreamByteMessageInput;
+import org.jboss.cx.remoting.util.IoUtil;
+
+/**
+ *
+ */
+public abstract class AbstractHttpUrlChannel {
+
+ private static final Logger log = Logger.getLogger(AbstractHttpUrlChannel.class);
+
+ private final CookieClientSession cookieClientSession = new CookieClientSession();
+
+ protected AbstractHttpUrlChannel() {
+ }
+
+ // Configuration
+
+ private int concurrentRequests = 2;
+ private int connectTimeout = 5000;
+ private int readTimeout = 5000;
+ private URL connectUrl;
+
+ public int getConcurrentRequests() {
+ return concurrentRequests;
+ }
+
+ public void setConcurrentRequests(final int concurrentRequests) {
+ this.concurrentRequests = concurrentRequests;
+ }
+
+ public int getConnectTimeout() {
+ return connectTimeout;
+ }
+
+ public void setConnectTimeout(final int connectTimeout) {
+ this.connectTimeout = connectTimeout;
+ }
+
+ public int getReadTimeout() {
+ return readTimeout;
+ }
+
+ public void setReadTimeout(final int readTimeout) {
+ this.readTimeout = readTimeout;
+ }
+
+ public URL getConnectUrl() {
+ return connectUrl;
+ }
+
+ public void setConnectUrl(final URL connectUrl) {
+ this.connectUrl = connectUrl;
+ }
+
+ // Dependencies
+
+ private RemotingHttpSessionContext sessionContext;
+ private Executor executor;
+
+ public RemotingHttpSessionContext getSessionContext() {
+ return sessionContext;
+ }
+
+ public void setSessionContext(final RemotingHttpSessionContext sessionContext) {
+ this.sessionContext = sessionContext;
+ }
+
+ public Executor getExecutor() {
+ return executor;
+ }
+
+ public void setExecutor(final Executor executor) {
+ this.executor = executor;
+ }
+
+ // Lifecycle
+
+ private ExecutorService executorService;
+
+ public void create() {
+ if (executor == null) {
+ executor = executorService = Executors.newFixedThreadPool(concurrentRequests);
+ }
+ if (connectUrl == null) {
+ throw new NullPointerException("connectUrl is null");
+ }
+ if (sessionContext == null) {
+ throw new NullPointerException("sessionContext is null");
+ }
+ }
+
+ public void start() {
+
+ }
+
+ public void stop() {
+
+ }
+
+ public void destroy() {
+ try {
+
+ } finally {
+ if (executorService != null) {
+ executorService.shutdown();
+ }
+ }
+ executor = executorService = null;
+ sessionContext = null;
+ }
+
+ // Interface
+
+ protected void handleRequest(final URL connectUrl) {
+ final RemotingHttpSessionContext sessionContext = getSessionContext();
+ final OutgoingHttpMessage message = sessionContext.getOutgoingHttpMessage();
+ try {
+ final HttpURLConnection httpConnection = intializeConnection(connectUrl);
+ try {
+ httpConnection.connect();
+ final OutputStream outputStream = httpConnection.getOutputStream();
+ try {
+ message.writeMessageData(new AbstractOutputStreamByteMessageOutput(outputStream) {
+ public void commit() throws IOException {
+ }
+ });
+ // now read the reply
+ final String responseMessage = httpConnection.getResponseMessage();
+ log.trace("HTTP server sent back a response message: %s", responseMessage);
+ final List<String> setCookies = httpConnection.getHeaderFields().get("Set-Cookie");
+ for (String s : setCookies) {
+ cookieClientSession.handleSetCookieHeader(s, connectUrl.getHost(), connectUrl.getPath());
+ }
+ final InputStream inputStream = httpConnection.getInputStream();
+ try {
+ sessionContext.processInboundMessage(new AbstractIncomingHttpMessage() {
+ public ByteMessageInput getMessageData() throws IOException {
+ return new InputStreamByteMessageInput(inputStream, -1);
+ }
+ });
+ } finally {
+ IoUtil.closeSafely(inputStream);
+ }
+ } finally {
+ IoUtil.closeSafely(outputStream);
+ }
+ } catch (IOException e) {
+ // probably a HTTP error occurred, so let's consume it
+ try {
+ final InputStream errorStream = httpConnection.getErrorStream();
+ if (errorStream != null) try {
+ // consume & discard the error stream
+ while (errorStream.read() > -1);
+ errorStream.close();
+ } finally {
+ IoUtil.closeSafely(errorStream);
+ } else {
+ log.trace(e, "Connection failed but there is no error stream");
+ }
+ } catch (IOException e2) {
+ log.trace(e2, "Error consuming the error stream from remote URL '%s'", connectUrl);
+ }
+ // todo - need a backoff timer to prevent a storm of HTTP errors. Or perhaps the session should be torn down.
+ }
+ } catch (IOException e) {
+ log.trace(e, "Error establishing connection");
+ }
+ }
+
+ protected HttpURLConnection intializeConnection(final URL connectUrl) throws IOException {
+ final HttpURLConnection httpConnection = (HttpURLConnection) connectUrl.openConnection();
+ httpConnection.setDoInput(true);
+ httpConnection.setDoOutput(true);
+ httpConnection.setDefaultUseCaches(false);
+ httpConnection.setUseCaches(false);
+ httpConnection.setInstanceFollowRedirects(false);
+ httpConnection.setConnectTimeout(getConnectTimeout());
+ httpConnection.setReadTimeout(getReadTimeout());
+ httpConnection.setRequestMethod("POST"); // All remoting requests are POST
+ final String cookieHeader = cookieClientSession.getCookieHeader(connectUrl.getHost(), connectUrl.getPath(), false);
+ if (cookieHeader != null) {
+ httpConnection.setRequestProperty("Cookie", cookieHeader);
+ }
+ return httpConnection;
+ }
+}
Deleted: remoting3/trunk/http-urlconnection/src/main/java/org/jboss/cx/remoting/http/urlconnection/HttpUrlChannel.java
===================================================================
--- remoting3/trunk/http-urlconnection/src/main/java/org/jboss/cx/remoting/http/urlconnection/HttpUrlChannel.java 2008-04-18 21:37:17 UTC (rev 4016)
+++ remoting3/trunk/http-urlconnection/src/main/java/org/jboss/cx/remoting/http/urlconnection/HttpUrlChannel.java 2008-04-18 21:37:37 UTC (rev 4017)
@@ -1,141 +0,0 @@
-package org.jboss.cx.remoting.http.urlconnection;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentMap;
-import org.jboss.cx.remoting.http.spi.AbstractIncomingHttpMessage;
-import org.jboss.cx.remoting.http.spi.OutgoingHttpMessage;
-import org.jboss.cx.remoting.http.spi.RemotingHttpSessionContext;
-import org.jboss.cx.remoting.log.Logger;
-import org.jboss.cx.remoting.util.ByteMessageInput;
-import org.jboss.cx.remoting.util.ByteMessageOutput;
-import org.jboss.cx.remoting.util.CollectionUtil;
-
-/**
- *
- */
-public final class HttpUrlChannel {
-
- private static final Logger log = Logger.getLogger(HttpUrlChannel.class);
-
- private final ConcurrentMap<String, String> cookies = CollectionUtil.synchronizedMap(new LinkedHashMap<String, String>());
-
- private RemotingHttpSessionContext sessionContext;
-
- public RemotingHttpSessionContext getSessionContext() {
- return sessionContext;
- }
-
- public void setSessionContext(final RemotingHttpSessionContext sessionContext) {
- this.sessionContext = sessionContext;
- }
-
- public void doIt() {
- final URL connectUrl = null;
- new Runnable() {
- public void run() {
- for (;;) {
- final OutgoingHttpMessage message = sessionContext.getOutgoingHttpMessage();
- HttpURLConnection httpConnection = null;
- try {
- httpConnection = (HttpURLConnection) connectUrl.openConnection();
- httpConnection.setDoInput(true);
- httpConnection.setDoOutput(true);
- httpConnection.setDefaultUseCaches(false);
- httpConnection.setUseCaches(false);
- httpConnection.setInstanceFollowRedirects(false);
-// httpURLConnection.setConnectTimeout();
-// httpURLConnection.setReadTimeout();
- httpConnection.setRequestMethod("POST"); // All remoting requests are POST
- for (Map.Entry<String, String> entry : cookies.entrySet()) {
-// httpConnection.setRequestProperty();
-// entry.getKey()
- }
- httpConnection.connect();
- final OutputStream outputStream = httpConnection.getOutputStream();
- message.writeMessageData(new ByteMessageOutput() {
-
- public void write(final int b) throws IOException {
- outputStream.write(b);
- }
-
- public void write(final byte[] b) throws IOException {
- outputStream.write(b);
- }
-
- public void write(final byte[] b, final int offs, final int len) throws IOException {
- outputStream.write(b, offs, len);
- }
-
- public void commit() throws IOException {
- }
-
- public int getBytesWritten() throws IOException {
- throw new UnsupportedOperationException("getBytesWritten()");
- }
-
- public void close() throws IOException {
- outputStream.close();
- }
-
- public void flush() throws IOException {
- outputStream.flush();
- }
- });
- // now read the reply
- final List<String> setCookies = httpConnection.getHeaderFields().get("Set-Cookie");
- final InputStream inputStream = httpConnection.getInputStream();
- sessionContext.processInboundMessage(new AbstractIncomingHttpMessage() {
- public ByteMessageInput getMessageData() throws IOException {
- return new ByteMessageInput() {
-
- public int read() throws IOException {
- return inputStream.read();
- }
-
- public int read(final byte[] data) throws IOException {
- return inputStream.read(data);
- }
-
- public int read(final byte[] data, final int offs, final int len) throws IOException {
- return inputStream.read(data, offs, len);
- }
-
- public int remaining() {
- throw new UnsupportedOperationException("remaining()");
- }
-
- public void close() throws IOException {
- inputStream.close();
- }
- };
- }
- });
- } catch (IOException e) {
- // probably a HTTP error occurred, so let's consume it
- try {
- if (httpConnection != null) {
- final int responseCode = httpConnection.getResponseCode();
- log.trace("Got error response code %d from remote URL '%s'", Integer.valueOf(responseCode), connectUrl);
- final InputStream errorStream = httpConnection.getErrorStream();
- // consume & discard the error stream
- while (errorStream.read() > -1);
- errorStream.close();
- }
- } catch (IOException e2) {
- log.trace("Error consuming the error stream from remote URL '%s'", connectUrl);
- }
- // todo - need a backoff timer to prevent a storm of HTTP errors. Or perhaps the session should be torn down.
- }
- }
- }
- };
-
- }
-}
Added: remoting3/trunk/http-urlconnection/src/main/java/org/jboss/cx/remoting/http/urlconnection/HttpUrlChannel.java
===================================================================
--- remoting3/trunk/http-urlconnection/src/main/java/org/jboss/cx/remoting/http/urlconnection/HttpUrlChannel.java (rev 0)
+++ remoting3/trunk/http-urlconnection/src/main/java/org/jboss/cx/remoting/http/urlconnection/HttpUrlChannel.java 2008-04-18 21:37:37 UTC (rev 4017)
@@ -0,0 +1,16 @@
+package org.jboss.cx.remoting.http.urlconnection;
+
+/**
+ *
+ */
+public final class HttpUrlChannel extends AbstractHttpUrlChannel {
+
+ // lifecycle
+
+ public void create() {
+ final String protocol = getConnectUrl().getProtocol();
+ if (! "http".equals(protocol)) {
+ throw new IllegalArgumentException("Cannot use " + HttpUrlChannel.class.getName() + " for protocol \"" + protocol + "\"");
+ }
+ }
+}
Added: remoting3/trunk/http-urlconnection/src/main/java/org/jboss/cx/remoting/http/urlconnection/HttpsUrlChannel.java
===================================================================
--- remoting3/trunk/http-urlconnection/src/main/java/org/jboss/cx/remoting/http/urlconnection/HttpsUrlChannel.java (rev 0)
+++ remoting3/trunk/http-urlconnection/src/main/java/org/jboss/cx/remoting/http/urlconnection/HttpsUrlChannel.java 2008-04-18 21:37:37 UTC (rev 4017)
@@ -0,0 +1,81 @@
+package org.jboss.cx.remoting.http.urlconnection;
+
+import java.io.IOException;
+import java.net.URL;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLSocketFactory;
+
+/**
+ *
+ */
+public final class HttpsUrlChannel extends AbstractHttpUrlChannel {
+
+ // Configuration
+
+ private HostnameVerifier hostnameVerifier;
+ private SSLSocketFactory sslSocketFactory;
+
+ public HostnameVerifier getHostnameVerifier() {
+ return hostnameVerifier;
+ }
+
+ public void setHostnameVerifier(final HostnameVerifier hostnameVerifier) {
+ this.hostnameVerifier = hostnameVerifier;
+ }
+
+ public SSLSocketFactory getSslSocketFactory() {
+ return sslSocketFactory;
+ }
+
+ public void setSslSocketFactory(final SSLSocketFactory sslSocketFactory) {
+ this.sslSocketFactory = sslSocketFactory;
+ }
+
+ // Dependencies
+
+
+
+ // Lifecycle
+
+ public void create() {
+ super.create();
+ if (hostnameVerifier == null) {
+ hostnameVerifier = HttpsURLConnection.getDefaultHostnameVerifier();
+ }
+ if (sslSocketFactory == null) {
+ sslSocketFactory = HttpsURLConnection.getDefaultSSLSocketFactory();
+ }
+ final String protocol = getConnectUrl().getProtocol();
+ if (! "https".equals(protocol)) {
+ throw new IllegalArgumentException("Cannot use " + HttpsUrlChannel.class.getName() + " for protocol \"" + protocol + "\"");
+ }
+ }
+
+ public void start() {
+ super.start();
+ }
+
+ public void stop() {
+ super.stop();
+ }
+
+ public void destroy() {
+ try {
+ super.destroy();
+ } finally {
+ hostnameVerifier = null;
+ sslSocketFactory = null;
+ }
+ }
+
+ // Interface
+
+ protected HttpsURLConnection intializeConnection(final URL connectUrl) throws IOException {
+ final HttpsURLConnection httpsURLConnection = (HttpsURLConnection) super.intializeConnection(connectUrl);
+ httpsURLConnection.setHostnameVerifier(hostnameVerifier);
+ httpsURLConnection.setSSLSocketFactory(sslSocketFactory);
+ return httpsURLConnection;
+ }
+}
16 years, 1 month
- 1
- 0
JBoss Remoting SVN: r4016 - remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2008-04-18 17:37:17 -0400 (Fri, 18 Apr 2008)
New Revision: 4016
Added:
remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/AbstractOutputStreamByteMessageOutput.java
remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/InputStreamByteMessageInput.java
Log:
Add base classes for byte message I/O
Added: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/AbstractOutputStreamByteMessageOutput.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/AbstractOutputStreamByteMessageOutput.java (rev 0)
+++ remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/AbstractOutputStreamByteMessageOutput.java 2008-04-18 21:37:17 UTC (rev 4016)
@@ -0,0 +1,46 @@
+package org.jboss.cx.remoting.util;
+
+import java.io.OutputStream;
+import java.io.IOException;
+
+/**
+ *
+ */
+public abstract class AbstractOutputStreamByteMessageOutput implements ByteMessageOutput {
+ private final OutputStream outputStream;
+ private int count;
+
+ protected AbstractOutputStreamByteMessageOutput(final OutputStream outputStream) {
+ if (outputStream == null) {
+ throw new NullPointerException("outputStream is null");
+ }
+ this.outputStream = outputStream;
+ }
+
+ public void write(final int b) throws IOException {
+ outputStream.write(b);
+ count ++;
+ }
+
+ public void write(final byte[] b) throws IOException {
+ outputStream.write(b);
+ count += b.length;
+ }
+
+ public void write(final byte[] b, final int offs, final int len) throws IOException {
+ outputStream.write(b, offs, len);
+ count += len;
+ }
+
+ public int getBytesWritten() throws IOException {
+ return count;
+ }
+
+ public void close() throws IOException {
+ outputStream.close();
+ }
+
+ public void flush() throws IOException {
+ outputStream.flush();
+ }
+}
Added: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/InputStreamByteMessageInput.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/InputStreamByteMessageInput.java (rev 0)
+++ remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/InputStreamByteMessageInput.java 2008-04-18 21:37:17 UTC (rev 4016)
@@ -0,0 +1,51 @@
+package org.jboss.cx.remoting.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ *
+ */
+public class InputStreamByteMessageInput implements ByteMessageInput {
+ private final InputStream inputStream;
+ private int remaining;
+
+ public InputStreamByteMessageInput(final InputStream inputStream, final int size) {
+ this.inputStream = inputStream;
+ remaining = size;
+ }
+
+ public int read() throws IOException {
+ final int data = inputStream.read();
+ if (data != -1 && remaining >= 0) {
+ remaining--;
+ }
+ return data;
+ }
+
+ public int read(final byte[] data) throws IOException {
+ final int cnt = inputStream.read(data);
+ if (cnt != -1 && remaining >= 0) {
+ remaining -= cnt;
+ }
+ return cnt;
+ }
+
+ public int read(final byte[] data, final int offs, final int len) throws IOException {
+ final int cnt = inputStream.read(data, offs, len);
+ if (cnt != -1 && remaining >= 0) {
+ remaining -= cnt;
+ }
+ return cnt;
+ }
+
+ public int remaining() {
+ final int remaining = this.remaining;
+ return remaining < 0 ? -1 : remaining;
+ }
+
+ public void close() throws IOException {
+ remaining = -1;
+ inputStream.close();
+ }
+}
16 years, 1 month
- 1
- 0
JBoss Remoting SVN: r4015 - in remoting3/trunk: api/src/main/java/org/jboss/cx/remoting/spi/marshal and 11 other directories.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2008-04-18 14:33:51 -0400 (Fri, 18 Apr 2008)
New Revision: 4015
Added:
remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/ByteMessageInput.java
remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/ByteMessageOutput.java
remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/DataMessageInput.java
remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/DataMessageOutput.java
remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/ObjectMessageInput.java
remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/ObjectMessageOutput.java
Removed:
remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/ByteMessageInput.java
remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/ByteMessageOutput.java
remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/DataMessageInput.java
remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/DataMessageOutput.java
remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/ObjectMessageInput.java
remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/ObjectMessageOutput.java
Modified:
remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/marshal/Marshaller.java
remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/protocol/ProtocolContext.java
remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/protocol/ProtocolHandler.java
remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/stream/StreamContext.java
remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/stream/StreamSerializer.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreStream.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/protocol/LocalProtocolHandler.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/InputStreamStreamSerializerFactory.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/IteratorStreamSerializerFactory.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/ObjectSinkStreamSerializerFactory.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/ObjectSourceStreamSerializerFactory.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/OutputStreamStreamSerailizerFactory.java
remoting3/trunk/http-urlconnection/src/main/java/org/jboss/cx/remoting/http/urlconnection/HttpUrlChannel.java
remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/OutputAction.java
remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/RemotingHttpSession.java
remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/spi/IncomingHttpMessage.java
remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/spi/OutgoingHttpMessage.java
remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java
remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/mina/IoBufferByteMessageInput.java
remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/mina/IoBufferByteMessageOutput.java
Log:
Move *MessageInput/Output to the util module
Deleted: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/ByteMessageInput.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/ByteMessageInput.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/ByteMessageInput.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -1,44 +0,0 @@
-package org.jboss.cx.remoting.spi;
-
-import java.io.Closeable;
-import java.io.IOException;
-
-/**
- * A readable source of byte data.
- */
-public interface ByteMessageInput extends Closeable {
- /**
- * Read one byte.
- *
- * @return the byte, or -1 if the end of the stream has been reached.
- * @throws IOException if an I/O error occurs
- */
- int read() throws IOException;
-
- /**
- * Read a series of bytes into an array.
- *
- * @param data the array into which data is to be read
- * @return the total number of bytes read, or -1 if there are no bytes remaining to read
- * @throws IOException if an I/O error occurs
- */
- int read(byte[] data) throws IOException;
-
- /**
- * Read a series of bytes into an array.
- *
- * @param data the array into which data is to be read
- * @param offs the start offset in the {@code data} array at which the data is written
- * @param len the maximum number of bytes to read
- * @return the total number of bytes read, or -1 if there are no bytes remaining to read
- * @throws IOException if an I/O error occurs
- */
- int read(byte[] data, int offs, int len) throws IOException;
-
- /**
- * Return the number of bytes remaining.
- *
- * @return the number of bytes, or -1 if the byte count cannot be determined
- */
- int remaining();
-}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/ByteMessageOutput.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/ByteMessageOutput.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/ByteMessageOutput.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -1,52 +0,0 @@
-package org.jboss.cx.remoting.spi;
-
-import java.io.Closeable;
-import java.io.Flushable;
-import java.io.IOException;
-
-/**
- * A writable destination for byte data.
- */
-public interface ByteMessageOutput extends Closeable, Flushable {
- /**
- * Write a single byte of data. The input argument is truncated to 8 bits.
- *
- * @param b the byte to write
- * @throws IOException if an I/O error occurs
- */
- void write(int b) throws IOException;
-
- /**
- * Write many bytes of data.
- *
- * @param b the bytes to write
- * @throws IOException if an I/O error occurs
- */
- void write(byte[] b) throws IOException;
-
- /**
- * Write many bytes of data.
- *
- * @param b the bytes to write
- * @param offs the offset in {@code b} to start reading bytes from
- * @param len the number of bytes to write
- * @throws IOException if an I/O error occurs
- */
- void write(byte[] b, int offs, int len) throws IOException;
-
- /**
- * Commit the written data. This causes the accumulated data to be sent as a message on the underlying
- * channel.
- *
- * @throws IOException if an I/O error occurs
- */
- void commit() throws IOException;
-
- /**
- * Get a count of the number of bytes written to this message.
- *
- * @return the count
- * @throws IOException if an I/O error occurs
- */
- int getBytesWritten() throws IOException;
-}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/DataMessageInput.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/DataMessageInput.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/DataMessageInput.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -1,9 +0,0 @@
-package org.jboss.cx.remoting.spi;
-
-import java.io.DataInput;
-
-/**
- *
- */
-public interface DataMessageInput extends ByteMessageInput, DataInput {
-}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/DataMessageOutput.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/DataMessageOutput.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/DataMessageOutput.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -1,9 +0,0 @@
-package org.jboss.cx.remoting.spi;
-
-import java.io.DataOutput;
-
-/**
- *
- */
-public interface DataMessageOutput extends ByteMessageOutput, DataOutput {
-}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/ObjectMessageInput.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/ObjectMessageInput.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/ObjectMessageInput.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -1,29 +0,0 @@
-package org.jboss.cx.remoting.spi;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-
-/**
- * A readable message.
- */
-public interface ObjectMessageInput extends DataMessageInput, ObjectInput {
- /**
- * Read an object using the current context classloader, or, if there is no such classloader, the classloader
- * which loaded this interface.
- *
- * @return the object from the message
- * @throws ClassNotFoundException if the class of the object could not be resolved by the classloader
- * @throws IOException if an I/O error occurs
- */
- Object readObject() throws ClassNotFoundException, IOException;
-
- /**
- * Read an object using the given classloader.
- *
- * @param loader the classloader to use
- * @return the object from the message
- * @throws ClassNotFoundException if the class of the object could not be resolved by the classloader
- * @throws IOException if an I/O error occurs
- */
- Object readObject(ClassLoader loader) throws ClassNotFoundException, IOException;
-}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/ObjectMessageOutput.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/ObjectMessageOutput.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/ObjectMessageOutput.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -1,9 +0,0 @@
-package org.jboss.cx.remoting.spi;
-
-import java.io.ObjectOutput;
-
-/**
- * A writable message.
- */
-public interface ObjectMessageOutput extends DataMessageOutput, ObjectOutput {
-}
Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/marshal/Marshaller.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/marshal/Marshaller.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/marshal/Marshaller.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -2,10 +2,10 @@
import java.io.IOException;
import java.io.Serializable;
-import org.jboss.cx.remoting.spi.DataMessageInput;
-import org.jboss.cx.remoting.spi.DataMessageOutput;
-import org.jboss.cx.remoting.spi.ObjectMessageInput;
-import org.jboss.cx.remoting.spi.ObjectMessageOutput;
+import org.jboss.cx.remoting.util.DataMessageInput;
+import org.jboss.cx.remoting.util.DataMessageOutput;
+import org.jboss.cx.remoting.util.ObjectMessageInput;
+import org.jboss.cx.remoting.util.ObjectMessageOutput;
/**
*
Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/protocol/ProtocolContext.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/protocol/ProtocolContext.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/protocol/ProtocolContext.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -3,10 +3,10 @@
import java.io.IOException;
import java.util.concurrent.Executor;
import org.jboss.cx.remoting.RemoteExecutionException;
-import org.jboss.cx.remoting.spi.ByteMessageInput;
-import org.jboss.cx.remoting.spi.ByteMessageOutput;
-import org.jboss.cx.remoting.spi.ObjectMessageInput;
-import org.jboss.cx.remoting.spi.ObjectMessageOutput;
+import org.jboss.cx.remoting.util.ByteMessageInput;
+import org.jboss.cx.remoting.util.ByteMessageOutput;
+import org.jboss.cx.remoting.util.ObjectMessageInput;
+import org.jboss.cx.remoting.util.ObjectMessageOutput;
/**
* The receiver interface for protocol sessions. Methods on this interface are invoked as a result of
Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/protocol/ProtocolHandler.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/protocol/ProtocolHandler.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/protocol/ProtocolHandler.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -3,7 +3,7 @@
import java.io.IOException;
import java.util.concurrent.Executor;
import org.jboss.cx.remoting.RemoteExecutionException;
-import org.jboss.cx.remoting.spi.ObjectMessageOutput;
+import org.jboss.cx.remoting.util.ObjectMessageOutput;
/**
* A protocol handler.
@@ -199,9 +199,9 @@
/**
* Send data over a stream. Returns a message output buffer that the message is written into. When the message
- * is fully written, the {@link org.jboss.cx.remoting.spi.ObjectMessageOutput#commit()} method will be called to perform
+ * is fully written, the {@link org.jboss.cx.remoting.util.ObjectMessageOutput#commit()} method will be called to perform
* the transmission. The supplied executor should be passed in to
- * {@link org.jboss.cx.remoting.spi.protocol.ProtocolContext#getMessageOutput(org.jboss.cx.remoting.spi.ByteMessageOutput,java.util.concurrent.Executor)},
+ * {@link org.jboss.cx.remoting.spi.protocol.ProtocolContext#getMessageOutput(org.jboss.cx.remoting.util.ByteMessageOutput ,java.util.concurrent.Executor)},
* if that method is used for serialization.
*
* @param streamIdentifier the stream to send data on
Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/stream/StreamContext.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/stream/StreamContext.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/stream/StreamContext.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -2,7 +2,7 @@
import java.io.Closeable;
import java.io.IOException;
-import org.jboss.cx.remoting.spi.ObjectMessageOutput;
+import org.jboss.cx.remoting.util.ObjectMessageOutput;
/**
*
Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/stream/StreamSerializer.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/stream/StreamSerializer.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/stream/StreamSerializer.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -1,7 +1,7 @@
package org.jboss.cx.remoting.spi.stream;
import java.io.IOException;
-import org.jboss.cx.remoting.spi.ObjectMessageInput;
+import org.jboss.cx.remoting.util.ObjectMessageInput;
/**
*
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -22,10 +22,10 @@
import org.jboss.cx.remoting.core.stream.DefaultStreamDetector;
import org.jboss.cx.remoting.core.util.DelegatingObjectInput;
import org.jboss.cx.remoting.log.Logger;
-import org.jboss.cx.remoting.spi.ByteMessageInput;
-import org.jboss.cx.remoting.spi.ByteMessageOutput;
-import org.jboss.cx.remoting.spi.ObjectMessageInput;
-import org.jboss.cx.remoting.spi.ObjectMessageOutput;
+import org.jboss.cx.remoting.util.ByteMessageInput;
+import org.jboss.cx.remoting.util.ByteMessageOutput;
+import org.jboss.cx.remoting.util.ObjectMessageInput;
+import org.jboss.cx.remoting.util.ObjectMessageOutput;
import org.jboss.cx.remoting.spi.protocol.ClientIdentifier;
import org.jboss.cx.remoting.spi.protocol.ProtocolContext;
import org.jboss.cx.remoting.spi.protocol.ProtocolHandler;
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreStream.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreStream.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreStream.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -3,8 +3,8 @@
import java.io.IOException;
import java.util.concurrent.Executor;
import org.jboss.cx.remoting.log.Logger;
-import org.jboss.cx.remoting.spi.ObjectMessageInput;
-import org.jboss.cx.remoting.spi.ObjectMessageOutput;
+import org.jboss.cx.remoting.util.ObjectMessageInput;
+import org.jboss.cx.remoting.util.ObjectMessageOutput;
import org.jboss.cx.remoting.spi.protocol.ProtocolHandler;
import org.jboss.cx.remoting.spi.protocol.StreamIdentifier;
import org.jboss.cx.remoting.spi.stream.RemoteStreamSerializer;
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/protocol/LocalProtocolHandler.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/protocol/LocalProtocolHandler.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/protocol/LocalProtocolHandler.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -3,7 +3,7 @@
import java.io.IOException;
import java.util.concurrent.Executor;
import org.jboss.cx.remoting.RemoteExecutionException;
-import org.jboss.cx.remoting.spi.ObjectMessageOutput;
+import org.jboss.cx.remoting.util.ObjectMessageOutput;
import org.jboss.cx.remoting.spi.protocol.ClientIdentifier;
import org.jboss.cx.remoting.spi.protocol.ProtocolContext;
import org.jboss.cx.remoting.spi.protocol.ProtocolHandler;
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/InputStreamStreamSerializerFactory.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/InputStreamStreamSerializerFactory.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/InputStreamStreamSerializerFactory.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -4,8 +4,8 @@
import java.io.InputStream;
import java.util.LinkedList;
import org.jboss.cx.remoting.log.Logger;
-import org.jboss.cx.remoting.spi.ObjectMessageInput;
-import org.jboss.cx.remoting.spi.ObjectMessageOutput;
+import org.jboss.cx.remoting.util.ObjectMessageInput;
+import org.jboss.cx.remoting.util.ObjectMessageOutput;
import org.jboss.cx.remoting.spi.stream.RemoteStreamSerializer;
import org.jboss.cx.remoting.spi.stream.StreamContext;
import org.jboss.cx.remoting.spi.stream.StreamSerializer;
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/IteratorStreamSerializerFactory.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/IteratorStreamSerializerFactory.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/IteratorStreamSerializerFactory.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -2,7 +2,7 @@
import java.io.IOException;
import java.util.Iterator;
-import org.jboss.cx.remoting.spi.ObjectMessageInput;
+import org.jboss.cx.remoting.util.ObjectMessageInput;
import org.jboss.cx.remoting.spi.stream.RemoteStreamSerializer;
import org.jboss.cx.remoting.spi.stream.StreamContext;
import org.jboss.cx.remoting.spi.stream.StreamSerializer;
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/ObjectSinkStreamSerializerFactory.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/ObjectSinkStreamSerializerFactory.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/ObjectSinkStreamSerializerFactory.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -1,8 +1,8 @@
package org.jboss.cx.remoting.core.stream;
import java.io.IOException;
-import org.jboss.cx.remoting.spi.ObjectMessageInput;
-import org.jboss.cx.remoting.spi.ObjectMessageOutput;
+import org.jboss.cx.remoting.util.ObjectMessageInput;
+import org.jboss.cx.remoting.util.ObjectMessageOutput;
import org.jboss.cx.remoting.spi.stream.RemoteStreamSerializer;
import org.jboss.cx.remoting.spi.stream.StreamContext;
import org.jboss.cx.remoting.spi.stream.StreamSerializer;
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/ObjectSourceStreamSerializerFactory.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/ObjectSourceStreamSerializerFactory.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/ObjectSourceStreamSerializerFactory.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -4,8 +4,8 @@
import java.util.LinkedList;
import java.util.NoSuchElementException;
import java.util.Queue;
-import org.jboss.cx.remoting.spi.ObjectMessageInput;
-import org.jboss.cx.remoting.spi.ObjectMessageOutput;
+import org.jboss.cx.remoting.util.ObjectMessageInput;
+import org.jboss.cx.remoting.util.ObjectMessageOutput;
import org.jboss.cx.remoting.spi.stream.RemoteStreamSerializer;
import org.jboss.cx.remoting.spi.stream.StreamContext;
import org.jboss.cx.remoting.spi.stream.StreamSerializer;
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/OutputStreamStreamSerailizerFactory.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/OutputStreamStreamSerailizerFactory.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/OutputStreamStreamSerailizerFactory.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -2,8 +2,8 @@
import java.io.IOException;
import java.io.OutputStream;
-import org.jboss.cx.remoting.spi.ObjectMessageInput;
-import org.jboss.cx.remoting.spi.ObjectMessageOutput;
+import org.jboss.cx.remoting.util.ObjectMessageInput;
+import org.jboss.cx.remoting.util.ObjectMessageOutput;
import org.jboss.cx.remoting.spi.stream.RemoteStreamSerializer;
import org.jboss.cx.remoting.spi.stream.StreamContext;
import org.jboss.cx.remoting.spi.stream.StreamSerializer;
Modified: remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/OutputAction.java
===================================================================
--- remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/OutputAction.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/OutputAction.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -1,6 +1,6 @@
package org.jboss.cx.remoting.http;
-import org.jboss.cx.remoting.spi.ByteMessageOutput;
+import org.jboss.cx.remoting.util.ByteMessageOutput;
import java.io.IOException;
/**
Modified: remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/RemotingHttpSession.java
===================================================================
--- remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/RemotingHttpSession.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/RemotingHttpSession.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -11,8 +11,8 @@
import org.jboss.cx.remoting.http.spi.AbstractOutgoingHttpMessage;
import org.jboss.cx.remoting.http.spi.IncomingHttpMessage;
import org.jboss.cx.remoting.http.spi.RemotingHttpSessionContext;
-import org.jboss.cx.remoting.spi.ByteMessageOutput;
-import org.jboss.cx.remoting.spi.ObjectMessageOutput;
+import org.jboss.cx.remoting.util.ByteMessageOutput;
+import org.jboss.cx.remoting.util.ObjectMessageOutput;
import org.jboss.cx.remoting.spi.protocol.ClientIdentifier;
import org.jboss.cx.remoting.spi.protocol.ProtocolContext;
import org.jboss.cx.remoting.spi.protocol.ProtocolHandler;
Modified: remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/spi/IncomingHttpMessage.java
===================================================================
--- remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/spi/IncomingHttpMessage.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/spi/IncomingHttpMessage.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -1,7 +1,7 @@
package org.jboss.cx.remoting.http.spi;
import java.io.IOException;
-import org.jboss.cx.remoting.spi.ByteMessageInput;
+import org.jboss.cx.remoting.util.ByteMessageInput;
/**
*
Modified: remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/spi/OutgoingHttpMessage.java
===================================================================
--- remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/spi/OutgoingHttpMessage.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/spi/OutgoingHttpMessage.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -1,7 +1,7 @@
package org.jboss.cx.remoting.http.spi;
import java.io.IOException;
-import org.jboss.cx.remoting.spi.ByteMessageOutput;
+import org.jboss.cx.remoting.util.ByteMessageOutput;
/**
*
Modified: remoting3/trunk/http-urlconnection/src/main/java/org/jboss/cx/remoting/http/urlconnection/HttpUrlChannel.java
===================================================================
--- remoting3/trunk/http-urlconnection/src/main/java/org/jboss/cx/remoting/http/urlconnection/HttpUrlChannel.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/http-urlconnection/src/main/java/org/jboss/cx/remoting/http/urlconnection/HttpUrlChannel.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -13,8 +13,8 @@
import org.jboss.cx.remoting.http.spi.OutgoingHttpMessage;
import org.jboss.cx.remoting.http.spi.RemotingHttpSessionContext;
import org.jboss.cx.remoting.log.Logger;
-import org.jboss.cx.remoting.spi.ByteMessageInput;
-import org.jboss.cx.remoting.spi.ByteMessageOutput;
+import org.jboss.cx.remoting.util.ByteMessageInput;
+import org.jboss.cx.remoting.util.ByteMessageOutput;
import org.jboss.cx.remoting.util.CollectionUtil;
/**
Modified: remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java
===================================================================
--- remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -27,8 +27,8 @@
import org.jboss.cx.remoting.jrpp.mina.IoBufferByteMessageInput;
import org.jboss.cx.remoting.jrpp.mina.IoBufferByteMessageOutput;
import org.jboss.cx.remoting.log.Logger;
-import org.jboss.cx.remoting.spi.ObjectMessageInput;
-import org.jboss.cx.remoting.spi.ObjectMessageOutput;
+import org.jboss.cx.remoting.util.ObjectMessageInput;
+import org.jboss.cx.remoting.util.ObjectMessageOutput;
import org.jboss.cx.remoting.spi.protocol.ClientIdentifier;
import org.jboss.cx.remoting.spi.protocol.ProtocolContext;
import org.jboss.cx.remoting.spi.protocol.ProtocolHandler;
Modified: remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/mina/IoBufferByteMessageInput.java
===================================================================
--- remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/mina/IoBufferByteMessageInput.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/mina/IoBufferByteMessageInput.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -2,7 +2,7 @@
import java.io.IOException;
import org.apache.mina.common.IoBuffer;
-import org.jboss.cx.remoting.spi.ByteMessageInput;
+import org.jboss.cx.remoting.util.ByteMessageInput;
/**
*
Modified: remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/mina/IoBufferByteMessageOutput.java
===================================================================
--- remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/mina/IoBufferByteMessageOutput.java 2008-04-18 18:32:22 UTC (rev 4014)
+++ remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/mina/IoBufferByteMessageOutput.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -3,7 +3,7 @@
import java.io.IOException;
import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.IoSession;
-import org.jboss.cx.remoting.spi.ByteMessageOutput;
+import org.jboss.cx.remoting.util.ByteMessageOutput;
/**
*
Copied: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/ByteMessageInput.java (from rev 3985, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/ByteMessageInput.java)
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/ByteMessageInput.java (rev 0)
+++ remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/ByteMessageInput.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -0,0 +1,44 @@
+package org.jboss.cx.remoting.util;
+
+import java.io.Closeable;
+import java.io.IOException;
+
+/**
+ * A readable source of byte data.
+ */
+public interface ByteMessageInput extends Closeable {
+ /**
+ * Read one byte.
+ *
+ * @return the byte, or -1 if the end of the stream has been reached.
+ * @throws IOException if an I/O error occurs
+ */
+ int read() throws IOException;
+
+ /**
+ * Read a series of bytes into an array.
+ *
+ * @param data the array into which data is to be read
+ * @return the total number of bytes read, or -1 if there are no bytes remaining to read
+ * @throws IOException if an I/O error occurs
+ */
+ int read(byte[] data) throws IOException;
+
+ /**
+ * Read a series of bytes into an array.
+ *
+ * @param data the array into which data is to be read
+ * @param offs the start offset in the {@code data} array at which the data is written
+ * @param len the maximum number of bytes to read
+ * @return the total number of bytes read, or -1 if there are no bytes remaining to read
+ * @throws IOException if an I/O error occurs
+ */
+ int read(byte[] data, int offs, int len) throws IOException;
+
+ /**
+ * Return the number of bytes remaining.
+ *
+ * @return the number of bytes, or -1 if the byte count cannot be determined
+ */
+ int remaining();
+}
Copied: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/ByteMessageOutput.java (from rev 3985, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/ByteMessageOutput.java)
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/ByteMessageOutput.java (rev 0)
+++ remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/ByteMessageOutput.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -0,0 +1,52 @@
+package org.jboss.cx.remoting.util;
+
+import java.io.Closeable;
+import java.io.Flushable;
+import java.io.IOException;
+
+/**
+ * A writable destination for byte data.
+ */
+public interface ByteMessageOutput extends Closeable, Flushable {
+ /**
+ * Write a single byte of data. The input argument is truncated to 8 bits.
+ *
+ * @param b the byte to write
+ * @throws IOException if an I/O error occurs
+ */
+ void write(int b) throws IOException;
+
+ /**
+ * Write many bytes of data.
+ *
+ * @param b the bytes to write
+ * @throws IOException if an I/O error occurs
+ */
+ void write(byte[] b) throws IOException;
+
+ /**
+ * Write many bytes of data.
+ *
+ * @param b the bytes to write
+ * @param offs the offset in {@code b} to start reading bytes from
+ * @param len the number of bytes to write
+ * @throws IOException if an I/O error occurs
+ */
+ void write(byte[] b, int offs, int len) throws IOException;
+
+ /**
+ * Commit the written data. This causes the accumulated data to be sent as a message on the underlying
+ * channel.
+ *
+ * @throws IOException if an I/O error occurs
+ */
+ void commit() throws IOException;
+
+ /**
+ * Get a count of the number of bytes written to this message.
+ *
+ * @return the count
+ * @throws IOException if an I/O error occurs
+ */
+ int getBytesWritten() throws IOException;
+}
Copied: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/DataMessageInput.java (from rev 3985, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/DataMessageInput.java)
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/DataMessageInput.java (rev 0)
+++ remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/DataMessageInput.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -0,0 +1,9 @@
+package org.jboss.cx.remoting.util;
+
+import java.io.DataInput;
+
+/**
+ *
+ */
+public interface DataMessageInput extends ByteMessageInput, DataInput {
+}
Copied: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/DataMessageOutput.java (from rev 3985, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/DataMessageOutput.java)
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/DataMessageOutput.java (rev 0)
+++ remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/DataMessageOutput.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -0,0 +1,9 @@
+package org.jboss.cx.remoting.util;
+
+import java.io.DataOutput;
+
+/**
+ *
+ */
+public interface DataMessageOutput extends ByteMessageOutput, DataOutput {
+}
Copied: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/ObjectMessageInput.java (from rev 3985, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/ObjectMessageInput.java)
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/ObjectMessageInput.java (rev 0)
+++ remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/ObjectMessageInput.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -0,0 +1,29 @@
+package org.jboss.cx.remoting.util;
+
+import java.io.IOException;
+import java.io.ObjectInput;
+
+/**
+ * A readable message.
+ */
+public interface ObjectMessageInput extends DataMessageInput, ObjectInput {
+ /**
+ * Read an object using the current context classloader, or, if there is no such classloader, the classloader
+ * which loaded this interface.
+ *
+ * @return the object from the message
+ * @throws ClassNotFoundException if the class of the object could not be resolved by the classloader
+ * @throws IOException if an I/O error occurs
+ */
+ Object readObject() throws ClassNotFoundException, IOException;
+
+ /**
+ * Read an object using the given classloader.
+ *
+ * @param loader the classloader to use
+ * @return the object from the message
+ * @throws ClassNotFoundException if the class of the object could not be resolved by the classloader
+ * @throws IOException if an I/O error occurs
+ */
+ Object readObject(ClassLoader loader) throws ClassNotFoundException, IOException;
+}
Copied: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/ObjectMessageOutput.java (from rev 3985, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/ObjectMessageOutput.java)
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/ObjectMessageOutput.java (rev 0)
+++ remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/ObjectMessageOutput.java 2008-04-18 18:33:51 UTC (rev 4015)
@@ -0,0 +1,9 @@
+package org.jboss.cx.remoting.util;
+
+import java.io.ObjectOutput;
+
+/**
+ * A writable message.
+ */
+public interface ObjectMessageOutput extends DataMessageOutput, ObjectOutput {
+}
16 years, 1 month
- 1
- 0
JBoss Remoting SVN: r4014 - remoting3/trunk.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2008-04-18 14:32:22 -0400 (Fri, 18 Apr 2008)
New Revision: 4014
Modified:
remoting3/trunk/build.xml
Log:
Fix a build error
Modified: remoting3/trunk/build.xml
===================================================================
--- remoting3/trunk/build.xml 2008-04-18 18:30:50 UTC (rev 4013)
+++ remoting3/trunk/build.xml 2008-04-18 18:32:22 UTC (rev 4014)
@@ -1052,6 +1052,9 @@
destdir="util/target/main/classes"
debug="true">
<compilerarg value="-Xlint:unchecked"/>
+ <classpath>
+ <path refid="log-jul.classpath"/>
+ </classpath>
</javac>
<touch file="util/target/main/.lastcompile" verbose="false"/>
</target>
16 years, 1 month
- 1
- 0
JBoss Remoting SVN: r4013 - in remoting3/trunk: util/src/main/java/org/jboss/cx/remoting/util and 1 other directory.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2008-04-18 14:30:50 -0400 (Fri, 18 Apr 2008)
New Revision: 4013
Modified:
remoting3/trunk/srp/src/main/java/org/jboss/cx/remoting/core/security/sasl/AbstractSrpSaslParticipant.java
remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/IoUtil.java
Log:
Inline the one user of getSlice(). Add javadocs to the remaining IoUtil methods.
Modified: remoting3/trunk/srp/src/main/java/org/jboss/cx/remoting/core/security/sasl/AbstractSrpSaslParticipant.java
===================================================================
--- remoting3/trunk/srp/src/main/java/org/jboss/cx/remoting/core/security/sasl/AbstractSrpSaslParticipant.java 2008-04-18 18:13:33 UTC (rev 4012)
+++ remoting3/trunk/srp/src/main/java/org/jboss/cx/remoting/core/security/sasl/AbstractSrpSaslParticipant.java 2008-04-18 18:30:50 UTC (rev 4013)
@@ -18,7 +18,6 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Random;
-import org.jboss.cx.remoting.util.IoUtil;
import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
@@ -470,8 +469,8 @@
final ByteBuffer homeSlice;
final ByteBuffer macSlice;
if (integrityEnabled) {
- homeSlice = IoUtil.getSlice(src, -macLength);
- macSlice = IoUtil.getSlice(src, macLength);
+ homeSlice = getSlice(src, -macLength);
+ macSlice = getSlice(src, macLength);
inboundMac.reset();
inboundMac.update((ByteBuffer) homeSlice.mark());
if (replayEnabled) {
@@ -501,6 +500,21 @@
return;
}
+ private static ByteBuffer getSlice(final ByteBuffer src, final int macLength) {
+ ByteBuffer slice = src.duplicate();
+ final int newLimit;
+ if (macLength < 0) {
+ // calculate from end
+ newLimit = src.limit() - macLength;
+ } else {
+ // calculate from start
+ newLimit = src.position() + macLength;
+ }
+ slice.limit(newLimit);
+ src.position(newLimit);
+ return slice;
+ }
+
public boolean isWrappable() {
return confidentialityEnabled || integrityEnabled;
}
Modified: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/IoUtil.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/IoUtil.java 2008-04-18 18:13:33 UTC (rev 4012)
+++ remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/IoUtil.java 2008-04-18 18:30:50 UTC (rev 4013)
@@ -11,21 +11,13 @@
public final class IoUtil {
private static final Logger log = Logger.getLogger(IoUtil.class);
- public static ByteBuffer getSlice(ByteBuffer source, int length) {
- ByteBuffer slice = source.duplicate();
- final int newLimit;
- if (length < 0) {
- // calculate from end
- newLimit = source.limit() - length;
- } else {
- // calculate from start
- newLimit = source.position() + length;
- }
- slice.limit(newLimit);
- source.position(newLimit);
- return slice;
- }
-
+ /**
+ * Base-64 decode a character buffer into a byte buffer.
+ *
+ * @param source the base-64 encoded source material
+ * @param target the target for the decoded data
+ * @throws Base64DecodingException if the source data is not in base-64 format
+ */
public static void base64Decode(CharBuffer source, ByteBuffer target) throws Base64DecodingException {
int triad;
while (source.hasRemaining()) {
@@ -126,6 +118,12 @@
'4', '5', '6', '7', '8', '9', '+', '/',
};
+ /**
+ * Base-64 encode a byte buffer into a character buffer.
+ *
+ * @param source the binary data to encode
+ * @param target the target for the encoded material
+ */
public static void base64Encode(ByteBuffer source, CharBuffer target) {
int idx = 0;
while (source.hasRemaining()) {
@@ -151,6 +149,12 @@
}
}
+ /**
+ * Close a resource without throwing an exception. If the underlying {@code close} throws an exception, log
+ * it. For use in {@code finally} blocks.
+ *
+ * @param c the resource to close
+ */
public static void closeSafely(Closeable c) {
try {
c.close();
16 years, 1 month
- 1
- 0
JBoss Remoting SVN: r4012 - in remoting3/trunk: util/src/main/java/org/jboss/cx/remoting/util and 1 other directory.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2008-04-18 14:13:33 -0400 (Fri, 18 Apr 2008)
New Revision: 4012
Modified:
remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/HttpProtocolSupport.java
remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/CollectionUtil.java
Log:
Use regular concurrent hash map when no special key/value types are needed
Modified: remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/HttpProtocolSupport.java
===================================================================
--- remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/HttpProtocolSupport.java 2008-04-18 16:54:37 UTC (rev 4011)
+++ remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http/HttpProtocolSupport.java 2008-04-18 18:13:33 UTC (rev 4012)
@@ -97,8 +97,7 @@
// Session management
- // todo - weak value concurrent hash map
- private final ConcurrentMap<String, RemotingHttpSession> sessionMap = CollectionUtil.concurrentMap();
+ private final ConcurrentMap<String, RemotingHttpSession> sessionMap = CollectionUtil.concurrentWeakValueMap();
private String generateSessionId() {
final byte[] bytes = new byte[32];
Modified: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/CollectionUtil.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/CollectionUtil.java 2008-04-18 16:54:37 UTC (rev 4011)
+++ remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/CollectionUtil.java 2008-04-18 18:13:33 UTC (rev 4012)
@@ -41,7 +41,7 @@
* @return a new concurrent map
*/
public static <K, V> ConcurrentMap<K, V> concurrentMap() {
- return new ConcurrentReferenceHashMap<K, V>(16, STRONG, STRONG);
+ return new ConcurrentHashMap<K, V>();
}
/**
16 years, 1 month
- 1
- 0
JBoss Remoting SVN: r4011 - remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2008-04-18 12:54:37 -0400 (Fri, 18 Apr 2008)
New Revision: 4011
Added:
remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/ConcurrentReferenceHashMap.java
Modified:
remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/CollectionUtil.java
Log:
Use the Lea-Greene concurrent reference map implementation from now on
Modified: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/CollectionUtil.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/CollectionUtil.java 2008-04-18 15:52:26 UTC (rev 4010)
+++ remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/CollectionUtil.java 2008-04-18 16:54:37 UTC (rev 4011)
@@ -21,6 +21,8 @@
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import static org.jboss.cx.remoting.util.ConcurrentReferenceHashMap.ReferenceType.STRONG;
+import static org.jboss.cx.remoting.util.ConcurrentReferenceHashMap.ReferenceType.WEAK;
/**
* A set of helpful utility functions for collections.
@@ -39,14 +41,28 @@
* @return a new concurrent map
*/
public static <K, V> ConcurrentMap<K, V> concurrentMap() {
- if (true) {
- return synchronizedHashMap();
- } else {
- return new ConcurrentHashMap<K, V>();
- }
+ return new ConcurrentReferenceHashMap<K, V>(16, STRONG, STRONG);
}
/**
+ * Create a concurrent map with weak keys.
+ *
+ * @return a new concurrent map with weak keys
+ */
+ public static <K, V> ConcurrentMap<K, V> concurrentWeakMap() {
+ return new ConcurrentReferenceHashMap<K, V>(16, WEAK, STRONG);
+ }
+
+ /**
+ * Create a concurrent map with weak values.
+ *
+ * @return a new concurrent map with weak values
+ */
+ public static <K, V> ConcurrentMap<K, V> concurrentWeakValueMap() {
+ return new ConcurrentReferenceHashMap<K, V>(16, STRONG, WEAK);
+ }
+
+ /**
* Create a synchronized map that obeys the contract for {@code ConcurrentMap}.
*
* @param original the map to be wrapped
Added: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/ConcurrentReferenceHashMap.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/ConcurrentReferenceHashMap.java (rev 0)
+++ remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/ConcurrentReferenceHashMap.java 2008-04-18 16:54:37 UTC (rev 4011)
@@ -0,0 +1,1674 @@
+/*
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/licenses/publicdomain
+ */
+
+package org.jboss.cx.remoting.util;
+import java.io.IOException;
+import java.io.Serializable;
+import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.SoftReference;
+import java.lang.ref.WeakReference;
+import java.util.AbstractCollection;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.EnumSet;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * An advanced hash table supporting configurable garbage collection semantics
+ * of keys and values, optional referential-equality, full concurrency of
+ * retrievals, and adjustable expected concurrency for updates.
+ *
+ * This table is designed around specific advanced use-cases. If there is any
+ * doubt whether this table is for you, you most likely should be using
+ * {@link java.util.concurrent.ConcurrentHashMap} instead.
+ *
+ * This table supports strong, weak, and soft keys and values. By default keys
+ * are weak, and values are strong. Such a configuration offers similar behavior
+ * to {@link java.util.WeakHashMap}, entries of this table are periodically
+ * removed once their corresponding keys are no longer referenced outside of
+ * this table. In other words, this table will not prevent a key from being
+ * discarded by the garbage collector. Once a key has been discarded by the
+ * collector, the corresponding entry is no longer visible to this table;
+ * however, the entry may occupy space until a future table operation decides to
+ * reclaim it. For this reason, summary functions such as <tt>size</tt> and
+ * <tt>isEmpty</tt> might return a value greater than the observed number of
+ * entries. In order to support a high level of concurrency, stale entries are
+ * only reclaimed during blocking (usually mutating) operations.
+ *
+ * Enabling soft keys allows entries in this table to remain until their space
+ * is absolutely needed by the garbage collector. This is unlike weak keys which
+ * can be reclaimed as soon as they are no longer referenced by a normal strong
+ * reference. The primary use case for soft keys is a cache, which ideally
+ * occupies memory that is not in use for as long as possible.
+ *
+ * By default, values are held using a normal strong reference. This provides
+ * the commonly desired guarantee that a value will always have at least the
+ * same life-span as it's key. For this reason, care should be taken to ensure
+ * that a value never refers, either directly or indirectly, to its key, thereby
+ * preventing reclamation. If this is unavoidable, then it is recommended to use
+ * the same reference type in use for the key. However, it should be noted that
+ * non-strong values may disappear before their corresponding key.
+ *
+ * While this table does allow the use of both strong keys and values, it is
+ * recommended to use {@link java.util.concurrent.ConcurrentHashMap} for such a
+ * configuration, since it is optimized for that case.
+ *
+ * Just like {@link java.util.concurrent.ConcurrentHashMap}, this class obeys
+ * the same functional specification as {@link java.util.Hashtable}, and
+ * includes versions of methods corresponding to each method of
+ * <tt>Hashtable</tt>. However, even though all operations are thread-safe,
+ * retrieval operations do <em>not</em> entail locking, and there is
+ * <em>not</em> any support for locking the entire table in a way that
+ * prevents all access. This class is fully interoperable with
+ * <tt>Hashtable</tt> in programs that rely on its thread safety but not on
+ * its synchronization details.
+ *
+ * <p>
+ * Retrieval operations (including <tt>get</tt>) generally do not block, so
+ * may overlap with update operations (including <tt>put</tt> and
+ * <tt>remove</tt>). Retrievals reflect the results of the most recently
+ * <em>completed</em> update operations holding upon their onset. For
+ * aggregate operations such as <tt>putAll</tt> and <tt>clear</tt>,
+ * concurrent retrievals may reflect insertion or removal of only some entries.
+ * Similarly, Iterators and Enumerations return elements reflecting the state of
+ * the hash table at some point at or since the creation of the
+ * iterator/enumeration. They do <em>not</em> throw
+ * {@link ConcurrentModificationException}. However, iterators are designed to
+ * be used by only one thread at a time.
+ *
+ * <p>
+ * The allowed concurrency among update operations is guided by the optional
+ * <tt>concurrencyLevel</tt> constructor argument (default <tt>16</tt>),
+ * which is used as a hint for internal sizing. The table is internally
+ * partitioned to try to permit the indicated number of concurrent updates
+ * without contention. Because placement in hash tables is essentially random,
+ * the actual concurrency will vary. Ideally, you should choose a value to
+ * accommodate as many threads as will ever concurrently modify the table. Using
+ * a significantly higher value than you need can waste space and time, and a
+ * significantly lower value can lead to thread contention. But overestimates
+ * and underestimates within an order of magnitude do not usually have much
+ * noticeable impact. A value of one is appropriate when it is known that only
+ * one thread will modify and all others will only read. Also, resizing this or
+ * any other kind of hash table is a relatively slow operation, so, when
+ * possible, it is a good idea to provide estimates of expected table sizes in
+ * constructors.
+ *
+ * <p>
+ * This class and its views and iterators implement all of the <em>optional</em>
+ * methods of the {@link Map} and {@link Iterator} interfaces.
+ *
+ * <p>
+ * Like {@link Hashtable} but unlike {@link HashMap}, this class does
+ * <em>not</em> allow <tt>null</tt> to be used as a key or value.
+ *
+ * <p>
+ * This class is a member of the <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @author Doug Lea
+ * @author Jason T. Greene
+ * @param <K> the type of keys maintained by this map
+ * @param <V> the type of mapped values
+ */
+public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
+ implements java.util.concurrent.ConcurrentMap<K, V>, Serializable {
+ private static final long serialVersionUID = 7249069246763182397L;
+
+ /*
+ * The basic strategy is to subdivide the table among Segments,
+ * each of which itself is a concurrently readable hash table.
+ */
+
+ /**
+ * An option specifying which Java reference type should be used to refer
+ * to a key and/or value.
+ */
+ public static enum ReferenceType {
+ /** Indicates a normal Java strong reference should be used */
+ STRONG,
+ /** Indicates a {@link WeakReference} should be used */
+ WEAK,
+ /** Indicates a {@link SoftReference} should be used */
+ SOFT
+ };
+
+
+ public static enum Option {
+ /** Indicates that referential-equality (== instead of .equals()) should
+ * be used when locating keys. This offers similar behavior to {@link IdentityHashMap} */
+ IDENTITY_COMPARISONS
+ };
+
+ /* ---------------- Constants -------------- */
+
+ static final ReferenceType DEFAULT_KEY_TYPE = ReferenceType.WEAK;
+
+ static final ReferenceType DEFAULT_VALUE_TYPE = ReferenceType.STRONG;
+
+
+ /**
+ * The default initial capacity for this table,
+ * used when not otherwise specified in a constructor.
+ */
+ static final int DEFAULT_INITIAL_CAPACITY = 16;
+
+ /**
+ * The default load factor for this table, used when not
+ * otherwise specified in a constructor.
+ */
+ static final float DEFAULT_LOAD_FACTOR = 0.75f;
+
+ /**
+ * The default concurrency level for this table, used when not
+ * otherwise specified in a constructor.
+ */
+ static final int DEFAULT_CONCURRENCY_LEVEL = 16;
+
+ /**
+ * The maximum capacity, used if a higher value is implicitly
+ * specified by either of the constructors with arguments. MUST
+ * be a power of two <= 1<<30 to ensure that entries are indexable
+ * using ints.
+ */
+ static final int MAXIMUM_CAPACITY = 1 << 30;
+
+ /**
+ * The maximum number of segments to allow; used to bound
+ * constructor arguments.
+ */
+ static final int MAX_SEGMENTS = 1 << 16; // slightly conservative
+
+ /**
+ * Number of unsynchronized retries in size and containsValue
+ * methods before resorting to locking. This is used to avoid
+ * unbounded retries if tables undergo continuous modification
+ * which would make it impossible to obtain an accurate result.
+ */
+ static final int RETRIES_BEFORE_LOCK = 2;
+
+ /* ---------------- Fields -------------- */
+
+ /**
+ * Mask value for indexing into segments. The upper bits of a
+ * key's hash code are used to choose the segment.
+ */
+ final int segmentMask;
+
+ /**
+ * Shift value for indexing within segments.
+ */
+ final int segmentShift;
+
+ /**
+ * The segments, each of which is a specialized hash table
+ */
+ final Segment<K,V>[] segments;
+
+ boolean identityComparisons;
+
+ transient Set<K> keySet;
+ transient Set<Map.Entry<K,V>> entrySet;
+ transient Collection<V> values;
+
+ /* ---------------- Small Utilities -------------- */
+
+ /**
+ * Applies a supplemental hash function to a given hashCode, which
+ * defends against poor quality hash functions. This is critical
+ * because ConcurrentReferenceHashMap uses power-of-two length hash tables,
+ * that otherwise encounter collisions for hashCodes that do not
+ * differ in lower or upper bits.
+ */
+ private static int hash(int h) {
+ // Spread bits to regularize both segment and index locations,
+ // using variant of single-word Wang/Jenkins hash.
+ h += (h << 15) ^ 0xffffcd7d;
+ h ^= (h >>> 10);
+ h += (h << 3);
+ h ^= (h >>> 6);
+ h += (h << 2) + (h << 14);
+ return h ^ (h >>> 16);
+ }
+
+ /**
+ * Returns the segment that should be used for key with given hash
+ * @param hash the hash code for the key
+ * @return the segment
+ */
+ final Segment<K,V> segmentFor(int hash) {
+ return segments[(hash >>> segmentShift) & segmentMask];
+ }
+
+ private int hashOf(Object key) {
+ return hash(identityComparisons ?
+ System.identityHashCode(key) : key.hashCode());
+ }
+
+ /* ---------------- Inner Classes -------------- */
+
+ static interface KeyReference {
+ int keyHash();
+ }
+
+ /**
+ * A weak-key reference which stores the key hash needed for reclamation.
+ */
+ static final class WeakKeyReference<K> extends WeakReference<K> implements KeyReference {
+ final int hash;
+ WeakKeyReference(K key, int hash, ReferenceQueue<K> refQueue) {
+ super(key, refQueue);
+ this.hash = hash;
+ }
+ public final int keyHash() {
+ return hash;
+ }
+ }
+
+ /**
+ * A soft-key reference which stores the key hash needed for reclamation.
+ */
+ static final class SoftKeyReference<K> extends SoftReference<K> implements KeyReference {
+ final int hash;
+ SoftKeyReference(K key, int hash, ReferenceQueue<K> refQueue) {
+ super(key, refQueue);
+ this.hash = hash;
+ }
+ public final int keyHash() {
+ return hash;
+ }
+ }
+
+ /**
+ * ConcurrentReferenceHashMap list entry. Note that this is never exported
+ * out as a user-visible Map.Entry.
+ *
+ * Because the value field is volatile, not final, it is legal wrt
+ * the Java Memory Model for an unsynchronized reader to see null
+ * instead of initial value when read via a data race. Although a
+ * reordering leading to this is not likely to ever actually
+ * occur, the Segment.readValueUnderLock method is used as a
+ * backup in case a null (pre-initialized) value is ever seen in
+ * an unsynchronized access method.
+ */
+ static final class HashEntry<K,V> {
+ final Object keyRef;
+ final int hash;
+ volatile Object valueRef;
+ final HashEntry<K,V> next;
+ final ReferenceType keyType;
+ final ReferenceType valueType;
+
+ HashEntry(K key, int hash, HashEntry<K,V> next, V value,
+ ReferenceType keyType, ReferenceType valueType,
+ ReferenceQueue<K> refQueue) {
+ this.keyType = keyType;
+ this.valueType = valueType;
+ this.keyRef = newKeyReference(key, hash, refQueue);
+ this.hash = hash;
+ this.next = next;
+ this.valueRef = newValueReference(value);
+ }
+
+ final Object newKeyReference(K key, int hash, ReferenceQueue<K> refQueue) {
+ switch (keyType) {
+ case WEAK:
+ return new WeakKeyReference<K>(key, hash, refQueue);
+ case SOFT:
+ return new SoftKeyReference<K>(key, hash, refQueue);
+ }
+
+ return key;
+ }
+
+ final Object newValueReference(V value) {
+ switch (valueType) {
+ case WEAK:
+ return new WeakReference<V>(value);
+ case SOFT:
+ return new SoftReference<V>(value);
+ }
+
+ return value;
+ }
+
+ @SuppressWarnings("unchecked")
+ final K key() {
+ if (keyRef instanceof Reference)
+ return ((Reference<K>)keyRef).get();
+
+ return (K) keyRef;
+ }
+
+ final V value() {
+ return dereferenceValue(valueRef);
+ }
+
+ @SuppressWarnings("unchecked")
+ final V dereferenceValue(Object value) {
+ if (value instanceof Reference)
+ return ((Reference<V>)value).get();
+
+ return (V) value;
+ }
+
+ final void setValue(V value) {
+ this.valueRef = newValueReference(value);
+ }
+
+ @SuppressWarnings("unchecked")
+ static final <K,V> HashEntry<K,V>[] newArray(int i) {
+ return new HashEntry[i];
+ }
+ }
+
+ /**
+ * Segments are specialized versions of hash tables. This
+ * subclasses from ReentrantLock opportunistically, just to
+ * simplify some locking and avoid separate construction.
+ */
+ static final class Segment<K,V> extends ReentrantLock implements Serializable {
+ /*
+ * Segments maintain a table of entry lists that are ALWAYS
+ * kept in a consistent state, so can be read without locking.
+ * Next fields of nodes are immutable (final). All list
+ * additions are performed at the front of each bin. This
+ * makes it easy to check changes, and also fast to traverse.
+ * When nodes would otherwise be changed, new nodes are
+ * created to replace them. This works well for hash tables
+ * since the bin lists tend to be short. (The average length
+ * is less than two for the default load factor threshold.)
+ *
+ * Read operations can thus proceed without locking, but rely
+ * on selected uses of volatiles to ensure that completed
+ * write operations performed by other threads are
+ * noticed. For most purposes, the "count" field, tracking the
+ * number of elements, serves as that volatile variable
+ * ensuring visibility. This is convenient because this field
+ * needs to be read in many read operations anyway:
+ *
+ * - All (unsynchronized) read operations must first read the
+ * "count" field, and should not look at table entries if
+ * it is 0.
+ *
+ * - All (synchronized) write operations should write to
+ * the "count" field after structurally changing any bin.
+ * The operations must not take any action that could even
+ * momentarily cause a concurrent read operation to see
+ * inconsistent data. This is made easier by the nature of
+ * the read operations in Map. For example, no operation
+ * can reveal that the table has grown but the threshold
+ * has not yet been updated, so there are no atomicity
+ * requirements for this with respect to reads.
+ *
+ * As a guide, all critical volatile reads and writes to the
+ * count field are marked in code comments.
+ */
+
+ private static final long serialVersionUID = 2249069246763182397L;
+
+ /**
+ * The number of elements in this segment's region.
+ */
+ transient volatile int count;
+
+ /**
+ * Number of updates that alter the size of the table. This is
+ * used during bulk-read methods to make sure they see a
+ * consistent snapshot: If modCounts change during a traversal
+ * of segments computing size or checking containsValue, then
+ * we might have an inconsistent view of state so (usually)
+ * must retry.
+ */
+ transient int modCount;
+
+ /**
+ * The table is rehashed when its size exceeds this threshold.
+ * (The value of this field is always <tt>(int)(capacity *
+ * loadFactor)</tt>.)
+ */
+ transient int threshold;
+
+ /**
+ * The per-segment table.
+ */
+ transient volatile HashEntry<K,V>[] table;
+
+ /**
+ * The load factor for the hash table. Even though this value
+ * is same for all segments, it is replicated to avoid needing
+ * links to outer object.
+ * @serial
+ */
+ final float loadFactor;
+
+ /**
+ * The collected weak-key reference queue for this segment.
+ * This should be (re)initialized whenever table is assigned,
+ */
+ transient volatile ReferenceQueue<K> refQueue;
+
+ final ReferenceType keyType;
+
+ final ReferenceType valueType;
+
+ final boolean identityComparisons;
+
+ Segment(int initialCapacity, float lf, ReferenceType keyType,
+ ReferenceType valueType, boolean identityComparisons) {
+ loadFactor = lf;
+ this.keyType = keyType;
+ this.valueType = valueType;
+ this.identityComparisons = identityComparisons;
+ setTable(HashEntry.<K,V>newArray(initialCapacity));
+ }
+
+ @SuppressWarnings("unchecked")
+ static final <K,V> Segment<K,V>[] newArray(int i) {
+ return new Segment[i];
+ }
+
+ private boolean keyEq(Object src, Object dest) {
+ return identityComparisons ? src == dest : src.equals(dest);
+ }
+
+ /**
+ * Sets table to new HashEntry array.
+ * Call only while holding lock or in constructor.
+ */
+ void setTable(HashEntry<K,V>[] newTable) {
+ threshold = (int)(newTable.length * loadFactor);
+ table = newTable;
+ refQueue = new ReferenceQueue<K>();
+ }
+
+ /**
+ * Returns properly casted first entry of bin for given hash.
+ */
+ HashEntry<K,V> getFirst(int hash) {
+ HashEntry<K,V>[] tab = table;
+ return tab[hash & (tab.length - 1)];
+ }
+
+ HashEntry<K,V> newHashEntry(K key, int hash, HashEntry<K, V> next, V value) {
+ return new HashEntry<K,V>(key, hash, next, value, keyType, valueType, refQueue);
+ }
+
+ /**
+ * Reads value field of an entry under lock. Called if value
+ * field ever appears to be null. This is possible only if a
+ * compiler happens to reorder a HashEntry initialization with
+ * its table assignment, which is legal under memory model
+ * but is not known to ever occur.
+ */
+ V readValueUnderLock(HashEntry<K,V> e) {
+ lock();
+ try {
+ removeStale();
+ return e.value();
+ } finally {
+ unlock();
+ }
+ }
+
+ /* Specialized implementations of map methods */
+
+ V get(Object key, int hash) {
+ if (count != 0) { // read-volatile
+ HashEntry<K,V> e = getFirst(hash);
+ while (e != null) {
+ if (e.hash == hash && keyEq(key, e.key())) {
+ Object opaque = e.valueRef;
+ if (opaque != null)
+ return e.dereferenceValue(opaque);
+
+ return readValueUnderLock(e); // recheck
+ }
+ e = e.next;
+ }
+ }
+ return null;
+ }
+
+ boolean containsKey(Object key, int hash) {
+ if (count != 0) { // read-volatile
+ HashEntry<K,V> e = getFirst(hash);
+ while (e != null) {
+ if (e.hash == hash && keyEq(key, e.key()))
+ return true;
+ e = e.next;
+ }
+ }
+ return false;
+ }
+
+ boolean containsValue(Object value) {
+ if (count != 0) { // read-volatile
+ HashEntry<K,V>[] tab = table;
+ int len = tab.length;
+ for (int i = 0 ; i < len; i++) {
+ for (HashEntry<K,V> e = tab[i]; e != null; e = e.next) {
+ Object opaque = e.valueRef;
+ V v;
+
+ if (opaque == null)
+ v = readValueUnderLock(e); // recheck
+ else
+ v = e.dereferenceValue(opaque);
+
+ if (value.equals(v))
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ boolean replace(K key, int hash, V oldValue, V newValue) {
+ lock();
+ try {
+ removeStale();
+ HashEntry<K,V> e = getFirst(hash);
+ while (e != null && (e.hash != hash || !keyEq(key, e.key())))
+ e = e.next;
+
+ boolean replaced = false;
+ if (e != null && oldValue.equals(e.value())) {
+ replaced = true;
+ e.setValue(newValue);
+ }
+ return replaced;
+ } finally {
+ unlock();
+ }
+ }
+
+ V replace(K key, int hash, V newValue) {
+ lock();
+ try {
+ removeStale();
+ HashEntry<K,V> e = getFirst(hash);
+ while (e != null && (e.hash != hash || !keyEq(key, e.key())))
+ e = e.next;
+
+ V oldValue = null;
+ if (e != null) {
+ oldValue = e.value();
+ e.setValue(newValue);
+ }
+ return oldValue;
+ } finally {
+ unlock();
+ }
+ }
+
+
+ V put(K key, int hash, V value, boolean onlyIfAbsent) {
+ lock();
+ try {
+ removeStale();
+ int c = count;
+ if (c++ > threshold) {// ensure capacity
+ int reduced = rehash();
+ if (reduced > 0) // adjust from possible weak cleanups
+ count = (c -= reduced) - 1; // write-volatile
+ }
+
+ HashEntry<K,V>[] tab = table;
+ int index = hash & (tab.length - 1);
+ HashEntry<K,V> first = tab[index];
+ HashEntry<K,V> e = first;
+ while (e != null && (e.hash != hash || !keyEq(key, e.key())))
+ e = e.next;
+
+ V oldValue;
+ if (e != null) {
+ oldValue = e.value();
+ if (!onlyIfAbsent)
+ e.setValue(value);
+ }
+ else {
+ oldValue = null;
+ ++modCount;
+ tab[index] = newHashEntry(key, hash, first, value);
+ count = c; // write-volatile
+ }
+ return oldValue;
+ } finally {
+ unlock();
+ }
+ }
+
+ int rehash() {
+ HashEntry<K,V>[] oldTable = table;
+ int oldCapacity = oldTable.length;
+ if (oldCapacity >= MAXIMUM_CAPACITY)
+ return 0;
+
+ /*
+ * Reclassify nodes in each list to new Map. Because we are
+ * using power-of-two expansion, the elements from each bin
+ * must either stay at same index, or move with a power of two
+ * offset. We eliminate unnecessary node creation by catching
+ * cases where old nodes can be reused because their next
+ * fields won't change. Statistically, at the default
+ * threshold, only about one-sixth of them need cloning when
+ * a table doubles. The nodes they replace will be garbage
+ * collectable as soon as they are no longer referenced by any
+ * reader thread that may be in the midst of traversing table
+ * right now.
+ */
+
+ HashEntry<K,V>[] newTable = HashEntry.newArray(oldCapacity<<1);
+ threshold = (int)(newTable.length * loadFactor);
+ int sizeMask = newTable.length - 1;
+ int reduce = 0;
+ for (int i = 0; i < oldCapacity ; i++) {
+ // We need to guarantee that any existing reads of old Map can
+ // proceed. So we cannot yet null out each bin.
+ HashEntry<K,V> e = oldTable[i];
+
+ if (e != null) {
+ HashEntry<K,V> next = e.next;
+ int idx = e.hash & sizeMask;
+
+ // Single node on list
+ if (next == null)
+ newTable[idx] = e;
+
+ else {
+ // Reuse trailing consecutive sequence at same slot
+ HashEntry<K,V> lastRun = e;
+ int lastIdx = idx;
+ for (HashEntry<K,V> last = next;
+ last != null;
+ last = last.next) {
+ int k = last.hash & sizeMask;
+ if (k != lastIdx) {
+ lastIdx = k;
+ lastRun = last;
+ }
+ }
+ newTable[lastIdx] = lastRun;
+ // Clone all remaining nodes
+ for (HashEntry<K,V> p = e; p != lastRun; p = p.next) {
+ // Skip GC'd weak refs
+ K key = p.key();
+ if (key == null) {
+ reduce++;
+ continue;
+ }
+ int k = p.hash & sizeMask;
+ HashEntry<K,V> n = newTable[k];
+ newTable[k] = newHashEntry(key, p.hash, n, p.value());
+ }
+ }
+ }
+ }
+ table = newTable;
+ return reduce;
+ }
+
+ /**
+ * Remove; match on key only if value null, else match both.
+ */
+ V remove(Object key, int hash, Object value, boolean weakRemove) {
+ lock();
+ try {
+ if (!weakRemove)
+ removeStale();
+ int c = count - 1;
+ HashEntry<K,V>[] tab = table;
+ int index = hash & (tab.length - 1);
+ HashEntry<K,V> first = tab[index];
+ HashEntry<K,V> e = first;
+ // a weak remove operation compares the WeakReference instance
+ while (e != null && (!weakRemove || key != e.keyRef)
+ && (e.hash != hash || !keyEq(key, e.key())))
+ e = e.next;
+
+ V oldValue = null;
+ if (e != null) {
+ V v = e.value();
+ if (value == null || value.equals(v)) {
+ oldValue = v;
+ // All entries following removed node can stay
+ // in list, but all preceding ones need to be
+ // cloned.
+ ++modCount;
+ HashEntry<K,V> newFirst = e.next;
+ for (HashEntry<K,V> p = first; p != e; p = p.next) {
+ K pKey = p.key();
+ if (pKey == null) { // Skip GC'd keys
+ c--;
+ continue;
+ }
+
+ newFirst = newHashEntry(pKey, p.hash, newFirst, p.value());
+ }
+ tab[index] = newFirst;
+ count = c; // write-volatile
+ }
+ }
+ return oldValue;
+ } finally {
+ unlock();
+ }
+ }
+
+ final void removeStale() {
+ if (keyType == ReferenceType.STRONG)
+ return;
+
+ KeyReference ref;
+ while ((ref = (KeyReference) refQueue.poll()) != null) {
+ remove(ref, ref.keyHash(), null, true);
+ }
+ }
+
+ void clear() {
+ if (count != 0) {
+ lock();
+ try {
+ HashEntry<K,V>[] tab = table;
+ for (int i = 0; i < tab.length ; i++)
+ tab[i] = null;
+ ++modCount;
+ // replace the reference queue to avoid unnecessary stale cleanups
+ refQueue = new ReferenceQueue<K>();
+ count = 0; // write-volatile
+ } finally {
+ unlock();
+ }
+ }
+ }
+ }
+
+
+
+ /* ---------------- Public operations -------------- */
+
+ /**
+ * Creates a new, empty map with the specified initial
+ * capacity, reference types, load factor and concurrency level.
+ *
+ * Behavioral changing options such as {@link Option#IDENTITY_COMPARISONS}
+ * can also be specified.
+ *
+ * @param initialCapacity the initial capacity. The implementation
+ * performs internal sizing to accommodate this many elements.
+ * @param loadFactor the load factor threshold, used to control resizing.
+ * Resizing may be performed when the average number of elements per
+ * bin exceeds this threshold.
+ * @param concurrencyLevel the estimated number of concurrently
+ * updating threads. The implementation performs internal sizing
+ * to try to accommodate this many threads.
+ * @param keyType the reference type to use for keys
+ * @param valueType the reference type to use for values
+ * @param options the behavioral options
+ * @throws IllegalArgumentException if the initial capacity is
+ * negative or the load factor or concurrencyLevel are
+ * nonpositive.
+ */
+ public ConcurrentReferenceHashMap(int initialCapacity,
+ float loadFactor, int concurrencyLevel,
+ ReferenceType keyType, ReferenceType valueType,
+ EnumSet<Option> options) {
+ if (!(loadFactor > 0) || initialCapacity < 0 || concurrencyLevel <= 0)
+ throw new IllegalArgumentException();
+
+ if (concurrencyLevel > MAX_SEGMENTS)
+ concurrencyLevel = MAX_SEGMENTS;
+
+ // Find power-of-two sizes best matching arguments
+ int sshift = 0;
+ int ssize = 1;
+ while (ssize < concurrencyLevel) {
+ ++sshift;
+ ssize <<= 1;
+ }
+ segmentShift = 32 - sshift;
+ segmentMask = ssize - 1;
+ this.segments = Segment.newArray(ssize);
+
+ if (initialCapacity > MAXIMUM_CAPACITY)
+ initialCapacity = MAXIMUM_CAPACITY;
+ int c = initialCapacity / ssize;
+ if (c * ssize < initialCapacity)
+ ++c;
+ int cap = 1;
+ while (cap < c)
+ cap <<= 1;
+
+ identityComparisons = options != null && options.contains(Option.IDENTITY_COMPARISONS);
+
+ for (int i = 0; i < this.segments.length; ++i)
+ this.segments[i] = new Segment<K,V>(cap, loadFactor,
+ keyType, valueType, identityComparisons);
+ }
+
+ /**
+ * Creates a new, empty map with the specified initial
+ * capacity, load factor and concurrency level.
+ *
+ * @param initialCapacity the initial capacity. The implementation
+ * performs internal sizing to accommodate this many elements.
+ * @param loadFactor the load factor threshold, used to control resizing.
+ * Resizing may be performed when the average number of elements per
+ * bin exceeds this threshold.
+ * @param concurrencyLevel the estimated number of concurrently
+ * updating threads. The implementation performs internal sizing
+ * to try to accommodate this many threads.
+ * @throws IllegalArgumentException if the initial capacity is
+ * negative or the load factor or concurrencyLevel are
+ * nonpositive.
+ */
+ public ConcurrentReferenceHashMap(int initialCapacity,
+ float loadFactor, int concurrencyLevel) {
+ this(initialCapacity, loadFactor, concurrencyLevel,
+ DEFAULT_KEY_TYPE, DEFAULT_VALUE_TYPE, null);
+ }
+
+ /**
+ * Creates a new, empty map with the specified initial capacity
+ * and load factor and with the default reference types (weak keys,
+ * strong values), and concurrencyLevel (16).
+ *
+ * @param initialCapacity The implementation performs internal
+ * sizing to accommodate this many elements.
+ * @param loadFactor the load factor threshold, used to control resizing.
+ * Resizing may be performed when the average number of elements per
+ * bin exceeds this threshold.
+ * @throws IllegalArgumentException if the initial capacity of
+ * elements is negative or the load factor is nonpositive
+ *
+ * @since 1.6
+ */
+ public ConcurrentReferenceHashMap(int initialCapacity, float loadFactor) {
+ this(initialCapacity, loadFactor, DEFAULT_CONCURRENCY_LEVEL);
+ }
+
+
+ /**
+ * Creates a new, empty map with the specified initial capacity,
+ * reference types and with default load factor (0.75) and concurrencyLevel (16).
+ *
+ * @param initialCapacity the initial capacity. The implementation
+ * performs internal sizing to accommodate this many elements.
+ * @param keyType the reference type to use for keys
+ * @param valueType the reference type to use for values
+ * @throws IllegalArgumentException if the initial capacity of
+ * elements is negative.
+ */
+ public ConcurrentReferenceHashMap(int initialCapacity,
+ ReferenceType keyType, ReferenceType valueType) {
+ this(initialCapacity, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL,
+ keyType, valueType, null);
+ }
+
+ /**
+ * Creates a new, empty map with the specified initial capacity,
+ * and with default reference types (weak keys, strong values),
+ * load factor (0.75) and concurrencyLevel (16).
+ *
+ * @param initialCapacity the initial capacity. The implementation
+ * performs internal sizing to accommodate this many elements.
+ * @throws IllegalArgumentException if the initial capacity of
+ * elements is negative.
+ */
+ public ConcurrentReferenceHashMap(int initialCapacity) {
+ this(initialCapacity, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL);
+ }
+
+ /**
+ * Creates a new, empty map with a default initial capacity (16),
+ * reference types (weak keys, strong values), default
+ * load factor (0.75) and concurrencyLevel (16).
+ */
+ public ConcurrentReferenceHashMap() {
+ this(DEFAULT_INITIAL_CAPACITY, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL);
+ }
+
+ /**
+ * Creates a new map with the same mappings as the given map.
+ * The map is created with a capacity of 1.5 times the number
+ * of mappings in the given map or 16 (whichever is greater),
+ * and a default load factor (0.75) and concurrencyLevel (16).
+ *
+ * @param m the map
+ */
+ public ConcurrentReferenceHashMap(Map<? extends K, ? extends V> m) {
+ this(Math.max((int) (m.size() / DEFAULT_LOAD_FACTOR) + 1,
+ DEFAULT_INITIAL_CAPACITY),
+ DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL);
+ putAll(m);
+ }
+
+ /**
+ * Returns <tt>true</tt> if this map contains no key-value mappings.
+ *
+ * @return <tt>true</tt> if this map contains no key-value mappings
+ */
+ public boolean isEmpty() {
+ final Segment<K,V>[] segments = this.segments;
+ /*
+ * We keep track of per-segment modCounts to avoid ABA
+ * problems in which an element in one segment was added and
+ * in another removed during traversal, in which case the
+ * table was never actually empty at any point. Note the
+ * similar use of modCounts in the size() and containsValue()
+ * methods, which are the only other methods also susceptible
+ * to ABA problems.
+ */
+ int[] mc = new int[segments.length];
+ int mcsum = 0;
+ for (int i = 0; i < segments.length; ++i) {
+ if (segments[i].count != 0)
+ return false;
+ else
+ mcsum += mc[i] = segments[i].modCount;
+ }
+ // If mcsum happens to be zero, then we know we got a snapshot
+ // before any modifications at all were made. This is
+ // probably common enough to bother tracking.
+ if (mcsum != 0) {
+ for (int i = 0; i < segments.length; ++i) {
+ if (segments[i].count != 0 ||
+ mc[i] != segments[i].modCount)
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Returns the number of key-value mappings in this map. If the
+ * map contains more than <tt>Integer.MAX_VALUE</tt> elements, returns
+ * <tt>Integer.MAX_VALUE</tt>.
+ *
+ * @return the number of key-value mappings in this map
+ */
+ public int size() {
+ final Segment<K,V>[] segments = this.segments;
+ long sum = 0;
+ long check = 0;
+ int[] mc = new int[segments.length];
+ // Try a few times to get accurate count. On failure due to
+ // continuous async changes in table, resort to locking.
+ for (int k = 0; k < RETRIES_BEFORE_LOCK; ++k) {
+ check = 0;
+ sum = 0;
+ int mcsum = 0;
+ for (int i = 0; i < segments.length; ++i) {
+ sum += segments[i].count;
+ mcsum += mc[i] = segments[i].modCount;
+ }
+ if (mcsum != 0) {
+ for (int i = 0; i < segments.length; ++i) {
+ check += segments[i].count;
+ if (mc[i] != segments[i].modCount) {
+ check = -1; // force retry
+ break;
+ }
+ }
+ }
+ if (check == sum)
+ break;
+ }
+ if (check != sum) { // Resort to locking all segments
+ sum = 0;
+ for (int i = 0; i < segments.length; ++i)
+ segments[i].lock();
+ for (int i = 0; i < segments.length; ++i)
+ sum += segments[i].count;
+ for (int i = 0; i < segments.length; ++i)
+ segments[i].unlock();
+ }
+ if (sum > Integer.MAX_VALUE)
+ return Integer.MAX_VALUE;
+ else
+ return (int)sum;
+ }
+
+ /**
+ * Returns the value to which the specified key is mapped,
+ * or {@code null} if this map contains no mapping for the key.
+ *
+ * <p>More formally, if this map contains a mapping from a key
+ * {@code k} to a value {@code v} such that {@code key.equals(k)},
+ * then this method returns {@code v}; otherwise it returns
+ * {@code null}. (There can be at most one such mapping.)
+ *
+ * @throws NullPointerException if the specified key is null
+ */
+ public V get(Object key) {
+ int hash = hashOf(key);
+ return segmentFor(hash).get(key, hash);
+ }
+
+ /**
+ * Tests if the specified object is a key in this table.
+ *
+ * @param key possible key
+ * @return <tt>true</tt> if and only if the specified object
+ * is a key in this table, as determined by the
+ * <tt>equals</tt> method; <tt>false</tt> otherwise.
+ * @throws NullPointerException if the specified key is null
+ */
+ public boolean containsKey(Object key) {
+ int hash = hashOf(key);
+ return segmentFor(hash).containsKey(key, hash);
+ }
+
+ /**
+ * Returns <tt>true</tt> if this map maps one or more keys to the
+ * specified value. Note: This method requires a full internal
+ * traversal of the hash table, and so is much slower than
+ * method <tt>containsKey</tt>.
+ *
+ * @param value value whose presence in this map is to be tested
+ * @return <tt>true</tt> if this map maps one or more keys to the
+ * specified value
+ * @throws NullPointerException if the specified value is null
+ */
+ public boolean containsValue(Object value) {
+ if (value == null)
+ throw new NullPointerException();
+
+ // See explanation of modCount use above
+
+ final Segment<K,V>[] segments = this.segments;
+ int[] mc = new int[segments.length];
+
+ // Try a few times without locking
+ for (int k = 0; k < RETRIES_BEFORE_LOCK; ++k) {
+ int sum = 0;
+ int mcsum = 0;
+ for (int i = 0; i < segments.length; ++i) {
+ int c = segments[i].count;
+ mcsum += mc[i] = segments[i].modCount;
+ if (segments[i].containsValue(value))
+ return true;
+ }
+ boolean cleanSweep = true;
+ if (mcsum != 0) {
+ for (int i = 0; i < segments.length; ++i) {
+ int c = segments[i].count;
+ if (mc[i] != segments[i].modCount) {
+ cleanSweep = false;
+ break;
+ }
+ }
+ }
+ if (cleanSweep)
+ return false;
+ }
+ // Resort to locking all segments
+ for (int i = 0; i < segments.length; ++i)
+ segments[i].lock();
+ boolean found = false;
+ try {
+ for (int i = 0; i < segments.length; ++i) {
+ if (segments[i].containsValue(value)) {
+ found = true;
+ break;
+ }
+ }
+ } finally {
+ for (int i = 0; i < segments.length; ++i)
+ segments[i].unlock();
+ }
+ return found;
+ }
+
+ /**
+ * Legacy method testing if some key maps into the specified value
+ * in this table. This method is identical in functionality to
+ * {@link #containsValue}, and exists solely to ensure
+ * full compatibility with class {@link java.util.Hashtable},
+ * which supported this method prior to introduction of the
+ * Java Collections framework.
+
+ * @param value a value to search for
+ * @return <tt>true</tt> if and only if some key maps to the
+ * <tt>value</tt> argument in this table as
+ * determined by the <tt>equals</tt> method;
+ * <tt>false</tt> otherwise
+ * @throws NullPointerException if the specified value is null
+ */
+ public boolean contains(Object value) {
+ return containsValue(value);
+ }
+
+ /**
+ * Maps the specified key to the specified value in this table.
+ * Neither the key nor the value can be null.
+ *
+ * <p> The value can be retrieved by calling the <tt>get</tt> method
+ * with a key that is equal to the original key.
+ *
+ * @param key key with which the specified value is to be associated
+ * @param value value to be associated with the specified key
+ * @return the previous value associated with <tt>key</tt>, or
+ * <tt>null</tt> if there was no mapping for <tt>key</tt>
+ * @throws NullPointerException if the specified key or value is null
+ */
+ public V put(K key, V value) {
+ if (value == null)
+ throw new NullPointerException();
+ int hash = hashOf(key);
+ return segmentFor(hash).put(key, hash, value, false);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @return the previous value associated with the specified key,
+ * or <tt>null</tt> if there was no mapping for the key
+ * @throws NullPointerException if the specified key or value is null
+ */
+ public V putIfAbsent(K key, V value) {
+ if (value == null)
+ throw new NullPointerException();
+ int hash = hashOf(key);
+ return segmentFor(hash).put(key, hash, value, true);
+ }
+
+ /**
+ * Copies all of the mappings from the specified map to this one.
+ * These mappings replace any mappings that this map had for any of the
+ * keys currently in the specified map.
+ *
+ * @param m mappings to be stored in this map
+ */
+ public void putAll(Map<? extends K, ? extends V> m) {
+ for (Map.Entry<? extends K, ? extends V> e : m.entrySet())
+ put(e.getKey(), e.getValue());
+ }
+
+ /**
+ * Removes the key (and its corresponding value) from this map.
+ * This method does nothing if the key is not in the map.
+ *
+ * @param key the key that needs to be removed
+ * @return the previous value associated with <tt>key</tt>, or
+ * <tt>null</tt> if there was no mapping for <tt>key</tt>
+ * @throws NullPointerException if the specified key is null
+ */
+ public V remove(Object key) {
+ int hash = hashOf(key);
+ return segmentFor(hash).remove(key, hash, null, false);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @throws NullPointerException if the specified key is null
+ */
+ public boolean remove(Object key, Object value) {
+ int hash = hashOf(key);
+ if (value == null)
+ return false;
+ return segmentFor(hash).remove(key, hash, value, false) != null;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @throws NullPointerException if any of the arguments are null
+ */
+ public boolean replace(K key, V oldValue, V newValue) {
+ if (oldValue == null || newValue == null)
+ throw new NullPointerException();
+ int hash = hashOf(key);
+ return segmentFor(hash).replace(key, hash, oldValue, newValue);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @return the previous value associated with the specified key,
+ * or <tt>null</tt> if there was no mapping for the key
+ * @throws NullPointerException if the specified key or value is null
+ */
+ public V replace(K key, V value) {
+ if (value == null)
+ throw new NullPointerException();
+ int hash = hashOf(key);
+ return segmentFor(hash).replace(key, hash, value);
+ }
+
+ /**
+ * Removes all of the mappings from this map.
+ */
+ public void clear() {
+ for (int i = 0; i < segments.length; ++i)
+ segments[i].clear();
+ }
+
+ /**
+ * Removes any stale entries whose keys have been finalized. Use of this
+ * method is normally not necessary since stale entries are automatically
+ * removed lazily, when blocking operations are required. However, there
+ * are some cases where this operation should be performed eagerly, such
+ * as cleaning up old references to a ClassLoader in a multi-classloader
+ * environment.
+ *
+ * Note: this method will acquire locks, one at a time, across all segments
+ * of this table, so if it is to be used, it should be used sparingly.
+ */
+ public void purgeStaleEntries() {
+ for (int i = 0; i < segments.length; ++i)
+ segments[i].removeStale();
+ }
+
+
+ /**
+ * Returns a {@link Set} view of the keys contained in this map.
+ * The set is backed by the map, so changes to the map are
+ * reflected in the set, and vice-versa. The set supports element
+ * removal, which removes the corresponding mapping from this map,
+ * via the <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
+ * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
+ * operations. It does not support the <tt>add</tt> or
+ * <tt>addAll</tt> operations.
+ *
+ * <p>The view's <tt>iterator</tt> is a "weakly consistent" iterator
+ * that will never throw {@link ConcurrentModificationException},
+ * and guarantees to traverse elements as they existed upon
+ * construction of the iterator, and may (but is not guaranteed to)
+ * reflect any modifications subsequent to construction.
+ */
+ public Set<K> keySet() {
+ Set<K> ks = keySet;
+ return (ks != null) ? ks : (keySet = new KeySet());
+ }
+
+ /**
+ * Returns a {@link Collection} view of the values contained in this map.
+ * The collection is backed by the map, so changes to the map are
+ * reflected in the collection, and vice-versa. The collection
+ * supports element removal, which removes the corresponding
+ * mapping from this map, via the <tt>Iterator.remove</tt>,
+ * <tt>Collection.remove</tt>, <tt>removeAll</tt>,
+ * <tt>retainAll</tt>, and <tt>clear</tt> operations. It does not
+ * support the <tt>add</tt> or <tt>addAll</tt> operations.
+ *
+ * <p>The view's <tt>iterator</tt> is a "weakly consistent" iterator
+ * that will never throw {@link ConcurrentModificationException},
+ * and guarantees to traverse elements as they existed upon
+ * construction of the iterator, and may (but is not guaranteed to)
+ * reflect any modifications subsequent to construction.
+ */
+ public Collection<V> values() {
+ Collection<V> vs = values;
+ return (vs != null) ? vs : (values = new Values());
+ }
+
+ /**
+ * Returns a {@link Set} view of the mappings contained in this map.
+ * The set is backed by the map, so changes to the map are
+ * reflected in the set, and vice-versa. The set supports element
+ * removal, which removes the corresponding mapping from the map,
+ * via the <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
+ * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
+ * operations. It does not support the <tt>add</tt> or
+ * <tt>addAll</tt> operations.
+ *
+ * <p>The view's <tt>iterator</tt> is a "weakly consistent" iterator
+ * that will never throw {@link ConcurrentModificationException},
+ * and guarantees to traverse elements as they existed upon
+ * construction of the iterator, and may (but is not guaranteed to)
+ * reflect any modifications subsequent to construction.
+ */
+ public Set<Map.Entry<K,V>> entrySet() {
+ Set<Map.Entry<K,V>> es = entrySet;
+ return (es != null) ? es : (entrySet = new EntrySet());
+ }
+
+ /**
+ * Returns an enumeration of the keys in this table.
+ *
+ * @return an enumeration of the keys in this table
+ * @see #keySet()
+ */
+ public Enumeration<K> keys() {
+ return new KeyIterator();
+ }
+
+ /**
+ * Returns an enumeration of the values in this table.
+ *
+ * @return an enumeration of the values in this table
+ * @see #values()
+ */
+ public Enumeration<V> elements() {
+ return new ValueIterator();
+ }
+
+ /* ---------------- Iterator Support -------------- */
+
+ abstract class HashIterator {
+ int nextSegmentIndex;
+ int nextTableIndex;
+ HashEntry<K,V>[] currentTable;
+ HashEntry<K, V> nextEntry;
+ HashEntry<K, V> lastReturned;
+ K currentKey; // Strong reference to weak key (prevents gc)
+
+ HashIterator() {
+ nextSegmentIndex = segments.length - 1;
+ nextTableIndex = -1;
+ advance();
+ }
+
+ public boolean hasMoreElements() { return hasNext(); }
+
+ final void advance() {
+ if (nextEntry != null && (nextEntry = nextEntry.next) != null)
+ return;
+
+ while (nextTableIndex >= 0) {
+ if ( (nextEntry = currentTable[nextTableIndex--]) != null)
+ return;
+ }
+
+ while (nextSegmentIndex >= 0) {
+ Segment<K,V> seg = segments[nextSegmentIndex--];
+ if (seg.count != 0) {
+ currentTable = seg.table;
+ for (int j = currentTable.length - 1; j >= 0; --j) {
+ if ( (nextEntry = currentTable[j]) != null) {
+ nextTableIndex = j - 1;
+ return;
+ }
+ }
+ }
+ }
+ }
+
+ public boolean hasNext() {
+ while (nextEntry != null) {
+ if (nextEntry.key() != null)
+ return true;
+ advance();
+ }
+
+ return false;
+ }
+
+ HashEntry<K,V> nextEntry() {
+ do {
+ if (nextEntry == null)
+ throw new NoSuchElementException();
+
+ lastReturned = nextEntry;
+ currentKey = lastReturned.key();
+ advance();
+ } while (currentKey == null); // Skip GC'd keys
+
+ return lastReturned;
+ }
+
+ public void remove() {
+ if (lastReturned == null)
+ throw new IllegalStateException();
+ ConcurrentReferenceHashMap.this.remove(currentKey);
+ lastReturned = null;
+ }
+ }
+
+ final class KeyIterator
+ extends HashIterator
+ implements Iterator<K>, Enumeration<K>
+ {
+ public K next() { return super.nextEntry().key(); }
+ public K nextElement() { return super.nextEntry().key(); }
+ }
+
+ final class ValueIterator
+ extends HashIterator
+ implements Iterator<V>, Enumeration<V>
+ {
+ public V next() { return super.nextEntry().value(); }
+ public V nextElement() { return super.nextEntry().value(); }
+ }
+
+ /*
+ * This class is needed for JDK5 compatibility.
+ */
+ static class SimpleEntry<K, V> implements Entry<K, V>,
+ java.io.Serializable {
+ private static final long serialVersionUID = -8499721149061103585L;
+
+ private final K key;
+ private V value;
+
+ public SimpleEntry(K key, V value) {
+ this.key = key;
+ this.value = value;
+ }
+
+ public SimpleEntry(Entry<? extends K, ? extends V> entry) {
+ this.key = entry.getKey();
+ this.value = entry.getValue();
+ }
+
+ public K getKey() {
+ return key;
+ }
+
+ public V getValue() {
+ return value;
+ }
+
+ public V setValue(V value) {
+ V oldValue = this.value;
+ this.value = value;
+ return oldValue;
+ }
+
+ public boolean equals(Object o) {
+ if (!(o instanceof Map.Entry))
+ return false;
+ @SuppressWarnings("unchecked")
+ Map.Entry e = (Map.Entry) o;
+ return eq(key, e.getKey()) && eq(value, e.getValue());
+ }
+
+ public int hashCode() {
+ return (key == null ? 0 : key.hashCode())
+ ^ (value == null ? 0 : value.hashCode());
+ }
+
+ public String toString() {
+ return key + "=" + value;
+ }
+
+ private static boolean eq(Object o1, Object o2) {
+ return o1 == null ? o2 == null : o1.equals(o2);
+ }
+ }
+
+
+ /**
+ * Custom Entry class used by EntryIterator.next(), that relays setValue
+ * changes to the underlying map.
+ */
+ final class WriteThroughEntry extends SimpleEntry<K,V>
+ {
+ private static final long serialVersionUID = -7900634345345313646L;
+
+ WriteThroughEntry(K k, V v) {
+ super(k,v);
+ }
+
+ /**
+ * Set our entry's value and write through to the map. The
+ * value to return is somewhat arbitrary here. Since a
+ * WriteThroughEntry does not necessarily track asynchronous
+ * changes, the most recent "previous" value could be
+ * different from what we return (or could even have been
+ * removed in which case the put will re-establish). We do not
+ * and cannot guarantee more.
+ */
+ public V setValue(V value) {
+ if (value == null) throw new NullPointerException();
+ V v = super.setValue(value);
+ ConcurrentReferenceHashMap.this.put(getKey(), value);
+ return v;
+ }
+ }
+
+ final class EntryIterator
+ extends HashIterator
+ implements Iterator<Entry<K,V>>
+ {
+ public Map.Entry<K,V> next() {
+ HashEntry<K,V> e = super.nextEntry();
+ return new WriteThroughEntry(e.key(), e.value());
+ }
+ }
+
+ final class KeySet extends AbstractSet<K> {
+ public Iterator<K> iterator() {
+ return new KeyIterator();
+ }
+ public int size() {
+ return ConcurrentReferenceHashMap.this.size();
+ }
+ public boolean isEmpty() {
+ return ConcurrentReferenceHashMap.this.isEmpty();
+ }
+ public boolean contains(Object o) {
+ return ConcurrentReferenceHashMap.this.containsKey(o);
+ }
+ public boolean remove(Object o) {
+ return ConcurrentReferenceHashMap.this.remove(o) != null;
+ }
+ public void clear() {
+ ConcurrentReferenceHashMap.this.clear();
+ }
+ }
+
+ final class Values extends AbstractCollection<V> {
+ public Iterator<V> iterator() {
+ return new ValueIterator();
+ }
+ public int size() {
+ return ConcurrentReferenceHashMap.this.size();
+ }
+ public boolean isEmpty() {
+ return ConcurrentReferenceHashMap.this.isEmpty();
+ }
+ public boolean contains(Object o) {
+ return ConcurrentReferenceHashMap.this.containsValue(o);
+ }
+ public void clear() {
+ ConcurrentReferenceHashMap.this.clear();
+ }
+ }
+
+ final class EntrySet extends AbstractSet<Map.Entry<K,V>> {
+ public Iterator<Map.Entry<K,V>> iterator() {
+ return new EntryIterator();
+ }
+ public boolean contains(Object o) {
+ if (!(o instanceof Map.Entry))
+ return false;
+ Map.Entry<?,?> e = (Map.Entry<?,?>)o;
+ V v = ConcurrentReferenceHashMap.this.get(e.getKey());
+ return v != null && v.equals(e.getValue());
+ }
+ public boolean remove(Object o) {
+ if (!(o instanceof Map.Entry))
+ return false;
+ Map.Entry<?,?> e = (Map.Entry<?,?>)o;
+ return ConcurrentReferenceHashMap.this.remove(e.getKey(), e.getValue());
+ }
+ public int size() {
+ return ConcurrentReferenceHashMap.this.size();
+ }
+ public boolean isEmpty() {
+ return ConcurrentReferenceHashMap.this.isEmpty();
+ }
+ public void clear() {
+ ConcurrentReferenceHashMap.this.clear();
+ }
+ }
+
+ /* ---------------- Serialization Support -------------- */
+
+ /**
+ * Save the state of the <tt>ConcurrentReferenceHashMap</tt> instance to a
+ * stream (i.e., serialize it).
+ * @param s the stream
+ * @serialData
+ * the key (Object) and value (Object)
+ * for each key-value mapping, followed by a null pair.
+ * The key-value mappings are emitted in no particular order.
+ */
+ private void writeObject(java.io.ObjectOutputStream s) throws IOException {
+ s.defaultWriteObject();
+
+ for (int k = 0; k < segments.length; ++k) {
+ Segment<K,V> seg = segments[k];
+ seg.lock();
+ try {
+ HashEntry<K,V>[] tab = seg.table;
+ for (int i = 0; i < tab.length; ++i) {
+ for (HashEntry<K,V> e = tab[i]; e != null; e = e.next) {
+ K key = e.key();
+ if (key == null) // Skip GC'd keys
+ continue;
+
+ s.writeObject(key);
+ s.writeObject(e.value());
+ }
+ }
+ } finally {
+ seg.unlock();
+ }
+ }
+ s.writeObject(null);
+ s.writeObject(null);
+ }
+
+ /**
+ * Reconstitute the <tt>ConcurrentReferenceHashMap</tt> instance from a
+ * stream (i.e., deserialize it).
+ * @param s the stream
+ */
+ @SuppressWarnings("unchecked")
+ private void readObject(java.io.ObjectInputStream s)
+ throws IOException, ClassNotFoundException {
+ s.defaultReadObject();
+
+ // Initialize each segment to be minimally sized, and let grow.
+ for (int i = 0; i < segments.length; ++i) {
+ segments[i].setTable(new HashEntry[1]);
+ }
+
+ // Read the keys and values, and put the mappings in the table
+ for (;;) {
+ K key = (K) s.readObject();
+ V value = (V) s.readObject();
+ if (key == null)
+ break;
+ put(key, value);
+ }
+ }
+}
16 years, 1 month
- 1
- 0
JBoss Remoting SVN: r4010 - in remoting3/trunk: core/src/main/java/org/jboss/cx/remoting/core and 1 other directory.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2008-04-18 11:52:26 -0400 (Fri, 18 Apr 2008)
New Revision: 4010
Modified:
remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/protocol/ProtocolContext.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java
Log:
Opening a client within a service should be idempotent - make it so. JBREM-963
Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/protocol/ProtocolContext.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/protocol/ProtocolContext.java 2008-04-18 15:16:59 UTC (rev 4009)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/protocol/ProtocolContext.java 2008-04-18 15:52:26 UTC (rev 4010)
@@ -9,32 +9,104 @@
import org.jboss.cx.remoting.spi.ObjectMessageOutput;
/**
+ * The receiver interface for protocol sessions. Methods on this interface are invoked as a result of
+ * the corresponding methods in {@link org.jboss.cx.remoting.spi.protocol.ProtocolHandler} being called on the
+ * remote side.
*
+ * These methods generally do not throw exceptions, in order to simplify protocol implementation.
*/
public interface ProtocolContext {
/* CLIENT methods */
+ /**
+ * Receive a reply to a request.
+ *
+ * @param clientIdentifier the client identifier
+ * @param requestIdentifier the identifier of the request that was finished
+ * @param reply the reply
+ */
void receiveReply(ClientIdentifier clientIdentifier, RequestIdentifier requestIdentifier, Object reply);
+ /**
+ * Receive an exception response to a request.
+ *
+ * @param clientIdentifier the client identifier
+ * @param requestIdentifier the identifier of the request which failed
+ * @param exception the exception
+ */
void receiveException(ClientIdentifier clientIdentifier, RequestIdentifier requestIdentifier, RemoteExecutionException exception);
+ /**
+ * Receive a cancel acknowledgement to a request.
+ *
+ * @param clientIdentifier the client identifier
+ * @param requestIdentifier the identifier of the request which was cancelled
+ */
void receiveCancelAcknowledge(ClientIdentifier clientIdentifier, RequestIdentifier requestIdentifier);
+ /**
+ * Receive a notification that the given service is closing - that is, no more clients can be opened from it.
+ *
+ * @param serviceIdentifier the identifier of the closing service
+ */
void receiveServiceClosing(ServiceIdentifier serviceIdentifier);
+ /**
+ * Receive a notification that the given client is closing - that is, no more requests may be sent on it.
+ *
+ * @param clientIdentifier the identifier of the closing client
+ * @param done {@code true} if the client is fully closed
+ */
void receiveClientClosing(ClientIdentifier clientIdentifier, boolean done);
/* SERVER methods */
+ /**
+ * Receive a notification that the given service was closed. The close may have been caused by a call to the
+ * {@link org.jboss.cx.remoting.ClientSource#close()} method.
+ *
+ * @param remoteServiceIdentifier the service identifier
+ */
void receiveServiceClose(ServiceIdentifier remoteServiceIdentifier);
+ /**
+ * Receive a notification that the given client was closed. The close may have been caused by a call to the
+ * {@link org.jboss.cx.remoting.Client#close()} or {@link org.jboss.cx.remoting.Client#closeImmediate()} methods.
+ *
+ * @param remoteClientIdentifier the client identifier
+ * @param immediate {@code true} if the client should be closed immediately
+ * @param cancel {@code true} if outstanding requests should be cancelled
+ * @param interrupt {@code true} if outstanding requests should be interrupted
+ */
void receiveClientClose(ClientIdentifier remoteClientIdentifier, boolean immediate, boolean cancel, boolean interrupt);
+ /**
+ * Receive a notification that a context was opened within a service. Subsequent requests for this client will
+ * be associated with the service. This method is idempotent, meaning that multiple calls with the same parameters
+ * are treated as one call.
+ *
+ * @param remoteServiceIdentifier the service identifier
+ * @param remoteClientIdentifier the client identifier
+ */
void receiveOpenedContext(ServiceIdentifier remoteServiceIdentifier, ClientIdentifier remoteClientIdentifier);
+ /**
+ * Receive a request from the remote side.
+ *
+ * @param remoteClientIdentifier the client identifier
+ * @param requestIdentifier the request identifier
+ * @param request the request
+ */
void receiveRequest(ClientIdentifier remoteClientIdentifier, RequestIdentifier requestIdentifier, Object request);
+ /**
+ * Receive a request to cancel an outstanding request.
+ *
+ * @param remoteClientIdentifier the client identifier
+ * @param requestIdentifier the request identifier
+ * @param mayInterrupt {@code true} if the request may be interrupted
+ */
void receiveCancelRequest(ClientIdentifier remoteClientIdentifier, RequestIdentifier requestIdentifier, boolean mayInterrupt);
/* SESSION methods */
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java 2008-04-18 15:16:59 UTC (rev 4009)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java 2008-04-18 15:52:26 UTC (rev 4010)
@@ -361,11 +361,15 @@
throw new NullPointerException("remoteClientIdentifier is null");
}
try {
- final ServerServicePair servicePair = serverServices.get(remoteServiceIdentifier);
- final ProtocolClientInitiatorImpl contextClient = new ProtocolClientInitiatorImpl(remoteClientIdentifier);
- final ClientResponder clientResponder = servicePair.serviceResponder.createNewClient(contextClient);
- // todo - who puts it in the map?
- serverContexts.put(remoteClientIdentifier, new ServerContextPair(contextClient, clientResponder));
+ // This operation needs to be idempotent
+ if (! serverContexts.containsKey(remoteClientIdentifier)) {
+ final ServerServicePair servicePair = serverServices.get(remoteServiceIdentifier);
+ final ProtocolClientInitiatorImpl contextClient = new ProtocolClientInitiatorImpl(remoteClientIdentifier);
+ final ClientResponder clientResponder = servicePair.serviceResponder.createNewClient(contextClient);
+ if (serverContexts.putIfAbsent(remoteClientIdentifier, new ServerContextPair(contextClient, clientResponder)) != null) {
+ clientResponder.handleClose(true, true);
+ }
+ }
} catch (RemotingException e) {
log.trace(e, "Failed to add a context to a service");
}
16 years, 1 month
- 1
- 0
JBoss Remoting SVN: r4009 - in remoting3/trunk: core/src/main/java/org/jboss/cx/remoting/core and 2 other directories.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2008-04-18 11:16:59 -0400 (Fri, 18 Apr 2008)
New Revision: 4009
Modified:
remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/protocol/ProtocolContext.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/protocol/LocalProtocolHandlerFactory.java
remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java
Log:
openSession really means that the remote side is ready to receive messages, so rename the method accordingly
Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/protocol/ProtocolContext.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/protocol/ProtocolContext.java 2008-04-18 14:59:24 UTC (rev 4008)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/protocol/ProtocolContext.java 2008-04-18 15:16:59 UTC (rev 4009)
@@ -43,7 +43,7 @@
void receiveStreamData(StreamIdentifier streamIdentifier, ObjectMessageInput data);
- void openSession(String remoteEndpointName);
+ void receiveRemoteSideReady(String remoteEndpointName);
void closeSession();
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java 2008-04-18 14:59:24 UTC (rev 4008)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java 2008-04-18 15:16:59 UTC (rev 4009)
@@ -333,7 +333,11 @@
throw new NullPointerException("streamIdentifier is null");
}
final CoreStream coreStream = streams.remove(streamIdentifier);
- // todo - shut down stream
+ try {
+ coreStream.getStreamSerializer().handleClose();
+ } catch (IOException e) {
+ log.trace(e, "Failed to close the stream");
+ }
}
public void receiveServiceClose(ServiceIdentifier serviceIdentifier) {
@@ -507,7 +511,7 @@
}
@SuppressWarnings ({"unchecked"})
- public void openSession(String remoteEndpointName) {
+ public void receiveRemoteSideReady(String remoteEndpointName) {
state.waitFor(State.CONNECTING);
state.requireTransitionExclusive(State.CONNECTING, State.UP);
try {
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/protocol/LocalProtocolHandlerFactory.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/protocol/LocalProtocolHandlerFactory.java 2008-04-18 14:59:24 UTC (rev 4008)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/protocol/LocalProtocolHandlerFactory.java 2008-04-18 15:16:59 UTC (rev 4009)
@@ -47,8 +47,8 @@
final LocalProtocolHandler otherProtocolHandler = new LocalProtocolHandler(ourProtocolContext, otherEndpointName);
final ProtocolContext otherProtocolContext = otherEndpoint.openIncomingSession(otherProtocolHandler);
final LocalProtocolHandler ourProtocolHandler = new LocalProtocolHandler(otherProtocolContext, endpointName);
- otherProtocolContext.openSession(endpointName);
- ourProtocolContext.openSession(otherEndpointName);
+ otherProtocolContext.receiveRemoteSideReady(endpointName);
+ ourProtocolContext.receiveRemoteSideReady(otherEndpointName);
return ourProtocolHandler;
}
Modified: remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java
===================================================================
--- remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java 2008-04-18 14:59:24 UTC (rev 4008)
+++ remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java 2008-04-18 15:16:59 UTC (rev 4009)
@@ -762,7 +762,7 @@
saslServerFilter.startEncryption(ioSession);
log.trace("Server transitioning to UP state");
state.requireTransition(State.AWAITING_CLIENT_RESPONSE, State.UP);
- protocolContext.openSession(remoteName);
+ protocolContext.receiveRemoteSideReady(remoteName);
}
} catch (SaslException ex) {
final IoBuffer buffer = newBuffer(100, true);
@@ -811,7 +811,7 @@
output.commit();
log.trace("Server transitioning to UP state (immediate)");
state.requireTransition(State.UP);
- protocolContext.openSession(remoteName);
+ protocolContext.receiveRemoteSideReady(remoteName);
} else {
state.requireTransition(State.AWAITING_CLIENT_RESPONSE);
}
@@ -874,7 +874,7 @@
saslClientFilter.startEncryption(ioSession);
log.trace("Client transitioning to UP state");
state.requireTransition(State.AWAITING_SERVER_CHALLENGE, State.UP);
- protocolContext.openSession(remoteName);
+ protocolContext.receiveRemoteSideReady(remoteName);
return;
}
case AUTH_FAILED: {
16 years, 1 month
- 1
- 0
JBoss Remoting SVN: r4008 - in remoting3/trunk: core/src/main/java/org/jboss/cx/remoting/core and 2 other directories.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2008-04-18 10:59:24 -0400 (Fri, 18 Apr 2008)
New Revision: 4008
Modified:
remoting3/trunk/build.xml
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/RemoteClassLoader.java
remoting3/trunk/samples/src/main/java/org/jboss/cx/remoting/samples/simple/JrppBasicExampleMain.java
remoting3/trunk/samples/src/main/java/org/jboss/cx/remoting/samples/simple/JrppStreamExampleMain.java
remoting3/trunk/samples/src/main/java/org/jboss/cx/remoting/samples/simple/LocalBasicExampleMain.java
remoting3/trunk/samples/src/main/java/org/jboss/cx/remoting/samples/simple/LocalStreamExampleMain.java
remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/IoUtil.java
Log:
Add IoUtil.closeSafely() method
Modified: remoting3/trunk/build.xml
===================================================================
--- remoting3/trunk/build.xml 2008-04-18 07:50:11 UTC (rev 4007)
+++ remoting3/trunk/build.xml 2008-04-18 14:59:24 UTC (rev 4008)
@@ -1060,7 +1060,7 @@
<delete dir="util/target"/>
</target>
- <target name="util" description="Build the utilities module" depends="util.compile">
+ <target name="util" description="Build the utilities module" depends="log-jul,util.compile">
<path id="util.classpath">
<pathelement location="util/target/main/classes"/>
</path>
Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/RemoteClassLoader.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/RemoteClassLoader.java 2008-04-18 07:50:11 UTC (rev 4007)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/RemoteClassLoader.java 2008-04-18 14:59:24 UTC (rev 4008)
@@ -11,6 +11,7 @@
import org.jboss.cx.remoting.service.ClassLoaderResourceRequest;
import org.jboss.cx.remoting.service.RemoteResource;
import org.jboss.cx.remoting.stream.ObjectSource;
+import org.jboss.cx.remoting.util.IoUtil;
/**
*
@@ -49,18 +50,10 @@
for (int t = 0; t < size; t += stream.read(bytes, t, size - t));
return defineClass(name, bytes, 0, size);
} finally {
- try {
- stream.close();
- } catch (IOException e) {
- log.trace("Stream close failed", e);
- }
+ IoUtil.closeSafely(stream);
}
} finally {
- try {
- source.close();
- } catch (IOException e) {
- log.trace("Resource ObjectSource close failed", e);
- }
+ IoUtil.closeSafely(source);
}
} catch (RemotingException e) {
throw new ClassNotFoundException("Cannot load class " + name + " due to an invocation failure", e);
Modified: remoting3/trunk/samples/src/main/java/org/jboss/cx/remoting/samples/simple/JrppBasicExampleMain.java
===================================================================
--- remoting3/trunk/samples/src/main/java/org/jboss/cx/remoting/samples/simple/JrppBasicExampleMain.java 2008-04-18 07:50:11 UTC (rev 4007)
+++ remoting3/trunk/samples/src/main/java/org/jboss/cx/remoting/samples/simple/JrppBasicExampleMain.java 2008-04-18 14:59:24 UTC (rev 4008)
@@ -10,9 +10,10 @@
import org.jboss.cx.remoting.RemoteExecutionException;
import org.jboss.cx.remoting.Remoting;
import org.jboss.cx.remoting.Session;
+import org.jboss.cx.remoting.core.security.sasl.Provider;
import org.jboss.cx.remoting.jrpp.JrppServer;
-import org.jboss.cx.remoting.core.security.sasl.Provider;
import org.jboss.cx.remoting.util.AttributeMap;
+import org.jboss.cx.remoting.util.IoUtil;
/**
*
@@ -34,10 +35,10 @@
final String result = client.invoke(original);
System.out.printf("The secret message \"%s\" became \"%s\"!\n", original.trim(), result.trim());
} finally {
- client.close();
+ IoUtil.closeSafely(client);
}
} finally {
- session.close();
+ IoUtil.closeSafely(session);
}
} finally {
jrppServer.stop();
Modified: remoting3/trunk/samples/src/main/java/org/jboss/cx/remoting/samples/simple/JrppStreamExampleMain.java
===================================================================
--- remoting3/trunk/samples/src/main/java/org/jboss/cx/remoting/samples/simple/JrppStreamExampleMain.java 2008-04-18 07:50:11 UTC (rev 4007)
+++ remoting3/trunk/samples/src/main/java/org/jboss/cx/remoting/samples/simple/JrppStreamExampleMain.java 2008-04-18 14:59:24 UTC (rev 4008)
@@ -13,9 +13,10 @@
import org.jboss.cx.remoting.RemoteExecutionException;
import org.jboss.cx.remoting.Remoting;
import org.jboss.cx.remoting.Session;
+import org.jboss.cx.remoting.core.security.sasl.Provider;
import org.jboss.cx.remoting.jrpp.JrppServer;
-import org.jboss.cx.remoting.core.security.sasl.Provider;
import org.jboss.cx.remoting.util.AttributeMap;
+import org.jboss.cx.remoting.util.IoUtil;
/**
*
@@ -43,19 +44,19 @@
final String secretLine = bufferedReader.readLine();
System.out.printf("The secret message \"%s\" became \"%s\"!\n", original.trim(), secretLine);
} finally {
- bufferedReader.close();
+ IoUtil.closeSafely(bufferedReader);
}
} finally {
- reader.close();
+ IoUtil.closeSafely(reader);
}
} finally {
- originalReader.close();
+ IoUtil.closeSafely(originalReader);
}
} finally {
- client.close();
+ IoUtil.closeSafely(client);
}
} finally {
- session.close();
+ IoUtil.closeSafely(session);
}
} finally {
jrppServer.stop();
Modified: remoting3/trunk/samples/src/main/java/org/jboss/cx/remoting/samples/simple/LocalBasicExampleMain.java
===================================================================
--- remoting3/trunk/samples/src/main/java/org/jboss/cx/remoting/samples/simple/LocalBasicExampleMain.java 2008-04-18 07:50:11 UTC (rev 4007)
+++ remoting3/trunk/samples/src/main/java/org/jboss/cx/remoting/samples/simple/LocalBasicExampleMain.java 2008-04-18 14:59:24 UTC (rev 4008)
@@ -7,6 +7,7 @@
import org.jboss.cx.remoting.RemoteExecutionException;
import org.jboss.cx.remoting.Remoting;
import org.jboss.cx.remoting.core.security.sasl.Provider;
+import org.jboss.cx.remoting.util.IoUtil;
/**
*
@@ -24,7 +25,7 @@
final String result = client.invoke(original);
System.out.printf("The secret message \"%s\" became \"%s\"!\n", original.trim(), result.trim());
} finally {
- client.close();
+ IoUtil.closeSafely(client);
}
} finally {
Remoting.closeEndpoint(endpoint);
Modified: remoting3/trunk/samples/src/main/java/org/jboss/cx/remoting/samples/simple/LocalStreamExampleMain.java
===================================================================
--- remoting3/trunk/samples/src/main/java/org/jboss/cx/remoting/samples/simple/LocalStreamExampleMain.java 2008-04-18 07:50:11 UTC (rev 4007)
+++ remoting3/trunk/samples/src/main/java/org/jboss/cx/remoting/samples/simple/LocalStreamExampleMain.java 2008-04-18 14:59:24 UTC (rev 4008)
@@ -10,6 +10,7 @@
import org.jboss.cx.remoting.RemoteExecutionException;
import org.jboss.cx.remoting.Remoting;
import org.jboss.cx.remoting.core.security.sasl.Provider;
+import org.jboss.cx.remoting.util.IoUtil;
/**
*
@@ -33,16 +34,16 @@
final String secretLine = bufferedReader.readLine();
System.out.printf("The secret message \"%s\" became \"%s\"!\n", original.trim(), secretLine);
} finally {
- bufferedReader.close();
+ IoUtil.closeSafely(bufferedReader);
}
} finally {
- reader.close();
+ IoUtil.closeSafely(reader);
}
} finally {
- originalReader.close();
+ IoUtil.closeSafely(originalReader);
}
} finally {
- client.close();
+ IoUtil.closeSafely(client);
}
} finally {
Remoting.closeEndpoint(endpoint);
Modified: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/IoUtil.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/IoUtil.java 2008-04-18 07:50:11 UTC (rev 4007)
+++ remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/IoUtil.java 2008-04-18 14:59:24 UTC (rev 4008)
@@ -1,12 +1,16 @@
package org.jboss.cx.remoting.util;
+import java.io.Closeable;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
+import org.jboss.cx.remoting.log.Logger;
/**
*
*/
public final class IoUtil {
+ private static final Logger log = Logger.getLogger(IoUtil.class);
+
public static ByteBuffer getSlice(ByteBuffer source, int length) {
ByteBuffer slice = source.duplicate();
final int newLimit;
@@ -146,4 +150,12 @@
target.put(base64table[b & 0x3f]);
}
}
+
+ public static void closeSafely(Closeable c) {
+ try {
+ c.close();
+ } catch (Throwable t) {
+ log.trace(t, "Closing %s failed", c);
+ }
+ }
}
16 years, 1 month
- 1
- 0