JBoss Remoting SVN: r6131 - remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-11-11 22:34:38 -0500 (Thu, 11 Nov 2010)
New Revision: 6131
Modified:
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/InboundRequestTask.java
Log:
JBREM-1257: The appropriate InboundClient is retrieved by RemoteMessageHandler instead of in a separate thread running InboundRequestTask.
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/InboundRequestTask.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/InboundRequestTask.java 2010-11-12 03:29:58 UTC (rev 6130)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/InboundRequestTask.java 2010-11-12 03:34:38 UTC (rev 6131)
@@ -35,17 +35,17 @@
final class InboundRequestTask implements Runnable {
private final InboundRequest inboundRequest;
+ private final InboundClient inboundClient;
private final int rid;
- private final int cid;
private RemoteConnectionHandler remoteConnectionHandler;
private static final Logger log = Loggers.main;
- InboundRequestTask(final RemoteConnectionHandler remoteConnectionHandler, final InboundRequest inboundRequest, final int rid, final int cid) {
+ InboundRequestTask(final RemoteConnectionHandler remoteConnectionHandler, final InboundRequest inboundRequest, InboundClient inboundClient, final int rid) {
this.remoteConnectionHandler = remoteConnectionHandler;
this.inboundRequest = inboundRequest;
+ this.inboundClient = inboundClient;
this.rid = rid;
- this.cid = cid;
}
public void run() {
@@ -55,11 +55,6 @@
inboundRequest.setReplyHandler(replyHandler = new OutboundReplyHandler(inboundRequest, rid));
}
final RemoteConnectionHandler connectionHandler = remoteConnectionHandler;
- final IntKeyMap<InboundClient> inboundClients = connectionHandler.getInboundClients();
- final InboundClient inboundClient;
- synchronized (inboundClients) {
- inboundClient = inboundClients.get(cid);
- }
final ClassLoader requestClassLoader = inboundClient.getHandler().getClassLoader();
final Object request;
try {
13 years, 5 months
JBoss Remoting SVN: r6130 - remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-11-11 22:29:58 -0500 (Thu, 11 Nov 2010)
New Revision: 6130
Modified:
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/RemoteClassTable.java
Log:
JBREM-1259: Initialized remoteClasses, localClasses, and localClassWriters.
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/RemoteClassTable.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/RemoteClassTable.java 2010-11-12 03:21:32 UTC (rev 6129)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/RemoteClassTable.java 2010-11-12 03:29:58 UTC (rev 6130)
@@ -38,9 +38,9 @@
private final ClientListener<ClassLookupRequest, ClassLookupResponse> clientListener = new RctClientListener();
private final RequestListener<ClassLookupRequest, ClassLookupResponse> requestListener = new RctRequestListener();
- private final ConcurrentMap<Integer, FutureClass> remoteClasses = null;
- private final ConcurrentMap<Integer, Class<?>> localClasses = null;
- private final ConcurrentMap<Class<?>, IntWriter> localClassWriters = null;
+ private final ConcurrentMap<Integer, FutureClass> remoteClasses = new CopyOnWriteHashMap<Integer, FutureClass>();
+ private final ConcurrentMap<Integer, Class<?>> localClasses = new CopyOnWriteHashMap<Integer, Class<?>>();
+ private final ConcurrentMap<Class<?>, IntWriter> localClassWriters = new CopyOnWriteHashMap<Class<?>, IntWriter>();
@SuppressWarnings({ "UnusedDeclaration" })
private volatile int seq;
13 years, 5 months
JBoss Remoting SVN: r6129 - remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2010-11-11 22:21:32 -0500 (Thu, 11 Nov 2010)
New Revision: 6129
Modified:
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/EndpointImpl.java
Log:
JBREM-1258: Eliminated duplicate ConnectionHandler.
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/EndpointImpl.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/EndpointImpl.java 2010-10-27 01:14:54 UTC (rev 6128)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/EndpointImpl.java 2010-11-12 03:21:32 UTC (rev 6129)
@@ -784,7 +784,7 @@
}
public void accept(final ConnectionHandlerFactory connectionHandlerFactory) {
- connectionHandlerFactory.createInstance(new LocalConnectionContext(connectionProviderContext, new ConnectionImpl(EndpointImpl.this, connectionHandlerFactory, this, "client")));
+ new ConnectionImpl(EndpointImpl.this, connectionHandlerFactory, this, "client");
}
public <T> Iterable<Map.Entry<String, T>> getProtocolServiceProviders(final ProtocolServiceType<T> serviceType) {
13 years, 5 months