JBoss Remoting SVN: r4788 - in remoting3/trunk: core/src/main/java/org/jboss/remoting/core and 2 other directories.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2009-01-07 23:17:15 -0500 (Wed, 07 Jan 2009)
New Revision: 4788
Modified:
remoting3/trunk/build.xml
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientImpl.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/util/QueueExecutor.java
remoting3/trunk/protocol/multiplex/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexConnection.java
remoting3/trunk/protocol/multiplex/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexReadHandler.java
Log:
Update for XNIO 1.2.0.CR2
Modified: remoting3/trunk/build.xml
===================================================================
--- remoting3/trunk/build.xml 2009-01-08 04:16:26 UTC (rev 4787)
+++ remoting3/trunk/build.xml 2009-01-08 04:17:15 UTC (rev 4788)
@@ -100,7 +100,7 @@
<target name="lib.xnio-api" depends="jboss.repository">
<mvn:dependencies pathId="lib.xnio-api.classpath">
<mvn:remoteRepository refid="jboss.repository"/>
- <mvn:dependency groupId="org.jboss.xnio" artifactId="xnio-api" version="1.2.0.CR1"/>
+ <mvn:dependency groupId="org.jboss.xnio" artifactId="xnio-api" version="1.2.0.CR2"/>
</mvn:dependencies>
<property name="lib.xnio-api.local" refid="lib.xnio-api.classpath"/>
</target>
@@ -110,7 +110,7 @@
<target name="lib.xnio-nio" depends="jboss.repository">
<mvn:dependencies pathId="lib.xnio-nio.classpath">
<mvn:remoteRepository refid="jboss.repository"/>
- <mvn:dependency groupId="org.jboss.xnio" artifactId="xnio-nio" version="1.2.0.CR1"/>
+ <mvn:dependency groupId="org.jboss.xnio" artifactId="xnio-nio" version="1.2.0.CR2"/>
</mvn:dependencies>
<property name="lib.xnio-nio.local" refid="lib.xnio-nio.classpath"/>
</target>
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientImpl.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientImpl.java 2009-01-08 04:16:26 UTC (rev 4787)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientImpl.java 2009-01-08 04:17:15 UTC (rev 4788)
@@ -79,11 +79,7 @@
final ReplyHandler replyHandler = futureReply.getReplyHandler();
final RemoteRequestContext requestContext = handle.getResource().receiveRequest(actualRequest, replyHandler);
futureReply.setRemoteRequestContext(requestContext);
- futureReply.addNotifier(new IoFuture.Notifier<O>() {
- public void notify(final IoFuture<O> future) {
- executor.shutdown();
- }
- });
+ futureReply.addNotifier(IoUtils.<O>attachmentClosingNotifier(), executor);
executor.runQueue();
try {
return futureReply.getInterruptibly();
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/util/QueueExecutor.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/util/QueueExecutor.java 2009-01-08 04:16:26 UTC (rev 4787)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/util/QueueExecutor.java 2009-01-08 04:17:15 UTC (rev 4788)
@@ -2,8 +2,8 @@
import java.util.LinkedList;
import java.util.Queue;
-import java.util.concurrent.Executor;
import org.jboss.xnio.log.Logger;
+import org.jboss.xnio.CloseableExecutor;
/**
* An executor designed to run all submitted tasks in the current thread. The queue is run continuously
@@ -11,7 +11,7 @@
* Only one thread should invoke the {@code runQueue()} method, which will run until the executor is
* shut down.
*/
-public final class QueueExecutor implements Executor {
+public final class QueueExecutor implements CloseableExecutor {
private static final Logger log = org.jboss.xnio.log.Logger.getLogger(QueueExecutor.class);
private final Queue<Runnable> queue = new LinkedList<Runnable>();
@@ -88,7 +88,7 @@
}
}
- public void shutdown() {
+ public void close() {
synchronized(queue) {
switch (state) {
case WAITING:
Modified: remoting3/trunk/protocol/multiplex/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexConnection.java
===================================================================
--- remoting3/trunk/protocol/multiplex/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexConnection.java 2009-01-08 04:16:26 UTC (rev 4787)
+++ remoting3/trunk/protocol/multiplex/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexConnection.java 2009-01-08 04:17:15 UTC (rev 4788)
@@ -26,7 +26,6 @@
import org.jboss.marshalling.MarshallingConfiguration;
import org.jboss.xnio.BufferAllocator;
import org.jboss.xnio.IoUtils;
-import org.jboss.xnio.IoFuture;
import org.jboss.xnio.Buffers;
import org.jboss.xnio.log.Logger;
import org.jboss.xnio.channels.AllocatedMessageChannel;
@@ -47,7 +46,6 @@
import java.nio.ByteBuffer;
import java.io.IOException;
import java.io.InterruptedIOException;
-import java.io.Closeable;
/**
*
@@ -437,7 +435,7 @@
IoUtils.safeClose(x);
}
for (FutureRemoteRequestHandlerSource future : remoteServices.getKeys()) {
- future.addNotifier(MultiplexConnection.<RequestHandlerSource>closingNotifier());
+ future.addNotifier(IoUtils.<RequestHandlerSource>closingNotifier(), null);
}
// Things running locally
for (RemoteRequestContext localRequest : localRequests.getKeys()) {
@@ -454,17 +452,4 @@
public String toString() {
return "multiplex connection <" + Integer.toHexString(hashCode()) + "> via " + channel;
}
-
- @SuppressWarnings({ "unchecked" })
- private static <T extends Closeable> IoFuture.Notifier<T> closingNotifier() {
- return (IoFuture.Notifier<T>) CLOSING_NOTIFIER;
- }
-
- private static final ClosingNotifier CLOSING_NOTIFIER = new ClosingNotifier();
-
- private static class ClosingNotifier extends IoFuture.HandlingNotifier<Closeable> {
- public void handleDone(final Closeable result) {
- IoUtils.safeClose(result);
- }
- }
}
Modified: remoting3/trunk/protocol/multiplex/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexReadHandler.java
===================================================================
--- remoting3/trunk/protocol/multiplex/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexReadHandler.java 2009-01-08 04:16:26 UTC (rev 4787)
+++ remoting3/trunk/protocol/multiplex/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexReadHandler.java 2009-01-08 04:17:15 UTC (rev 4788)
@@ -24,7 +24,6 @@
import org.jboss.xnio.IoReadHandler;
import org.jboss.xnio.IoUtils;
-import org.jboss.xnio.IoFuture;
import org.jboss.xnio.Buffers;
import org.jboss.xnio.log.Logger;
import org.jboss.xnio.channels.AllocatedMessageChannel;
@@ -366,11 +365,7 @@
final int serviceId = buffer.getInt();
final FutureRemoteRequestHandlerSource future = connection.removeFutureRemoteService(serviceId);
log.trace("Received a service close notify message for service %d for %s", Integer.valueOf(serviceId), future);
- future.addNotifier(new IoFuture.HandlingNotifier<RequestHandlerSource>() {
- public void handleDone(final RequestHandlerSource result) {
- IoUtils.safeClose(result);
- }
- });
+ future.addNotifier(IoUtils.<RequestHandlerSource>closingNotifier(), null);
break;
}
case SERVICE_CLOSE_REQUEST: {
15 years, 10 months
JBoss Remoting SVN: r4787 - remoting3/trunk/protocol/basic/src/test/java/org/jboss/remoting/protocol/basic.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2009-01-07 23:16:26 -0500 (Wed, 07 Jan 2009)
New Revision: 4787
Modified:
remoting3/trunk/protocol/basic/src/test/java/org/jboss/remoting/protocol/basic/BasicTestCase.java
Log:
import fix (2)
Modified: remoting3/trunk/protocol/basic/src/test/java/org/jboss/remoting/protocol/basic/BasicTestCase.java
===================================================================
--- remoting3/trunk/protocol/basic/src/test/java/org/jboss/remoting/protocol/basic/BasicTestCase.java 2009-01-08 03:37:51 UTC (rev 4786)
+++ remoting3/trunk/protocol/basic/src/test/java/org/jboss/remoting/protocol/basic/BasicTestCase.java 2009-01-08 04:16:26 UTC (rev 4787)
@@ -40,7 +40,7 @@
import org.jboss.remoting.spi.RequestHandler;
import org.jboss.remoting.spi.Handle;
import org.jboss.marshalling.MarshallingConfiguration;
-import org.jboss.marshalling.river.RiverMarshallerFactory;
+import org.jboss.river.RiverMarshallerFactory;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.LinkedBlockingQueue;
15 years, 10 months
JBoss Remoting SVN: r4786 - remoting3/trunk/protocol/basic/src/test/java/org/jboss/remoting/protocol/basic.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2009-01-07 22:37:51 -0500 (Wed, 07 Jan 2009)
New Revision: 4786
Modified:
remoting3/trunk/protocol/basic/src/test/java/org/jboss/remoting/protocol/basic/BasicTestCase.java
Log:
import cleanup
Modified: remoting3/trunk/protocol/basic/src/test/java/org/jboss/remoting/protocol/basic/BasicTestCase.java
===================================================================
--- remoting3/trunk/protocol/basic/src/test/java/org/jboss/remoting/protocol/basic/BasicTestCase.java 2009-01-05 07:06:49 UTC (rev 4785)
+++ remoting3/trunk/protocol/basic/src/test/java/org/jboss/remoting/protocol/basic/BasicTestCase.java 2009-01-08 03:37:51 UTC (rev 4786)
@@ -30,7 +30,6 @@
import org.jboss.xnio.IoFuture;
import org.jboss.xnio.nio.NioXnio;
import org.jboss.xnio.channels.StreamChannel;
-import org.jboss.river.RiverMarshallerFactory;
import org.jboss.remoting.Endpoint;
import org.jboss.remoting.Remoting;
import org.jboss.remoting.AbstractRequestListener;
@@ -41,6 +40,7 @@
import org.jboss.remoting.spi.RequestHandler;
import org.jboss.remoting.spi.Handle;
import org.jboss.marshalling.MarshallingConfiguration;
+import org.jboss.marshalling.river.RiverMarshallerFactory;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.LinkedBlockingQueue;
15 years, 10 months
JBoss Remoting SVN: r4785 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket.
by jboss-remoting-commits＠lists.jboss.org
Author: trustin
Date: 2009-01-05 02:06:49 -0500 (Mon, 05 Jan 2009)
New Revision: 4785
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java
Log:
Fixed issue: JBREM-992 Can't restart a Connector that uses SocketServerInvoker
* Made sure maxPoolSize is set to the default value if unspecified
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java 2009-01-05 07:01:20 UTC (rev 4784)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java 2009-01-05 07:06:49 UTC (rev 4785)
@@ -228,6 +228,12 @@
{
log.debug(this + " starting");
+ if(maxPoolSize <= 0)
+ {
+ //need to reset to default
+ maxPoolSize = MAX_POOL_SIZE_DEFAULT;
+ }
+
clientpool = new LRUPool(2, maxPoolSize);
clientpool.create();
threadpool = new LinkedList();
15 years, 10 months
JBoss Remoting SVN: r4784 - remoting2/branches/2.x.
by jboss-remoting-commits＠lists.jboss.org
Author: trustin
Date: 2009-01-05 02:01:20 -0500 (Mon, 05 Jan 2009)
New Revision: 4784
Modified:
remoting2/branches/2.x/.classpath
Log:
Fixed build path errors in Eclipse .classpath file
Modified: remoting2/branches/2.x/.classpath
===================================================================
--- remoting2/branches/2.x/.classpath 2009-01-03 10:28:28 UTC (rev 4783)
+++ remoting2/branches/2.x/.classpath 2009-01-05 07:01:20 UTC (rev 4784)
@@ -3,8 +3,6 @@
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="src" path="src/tests"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/apache-commons/lib/commons-httpclient.jar"/>
- <classpathentry kind="lib" path="lib/apache-commons/lib/commons-logging-api.jar"/>
<classpathentry kind="lib" path="lib/apache-log4j/lib/log4j.jar"/>
<classpathentry kind="lib" path="lib/dom4j/lib/dom4j.jar"/>
<classpathentry kind="lib" path="lib/jboss/jboss-jmx.jar"/>
@@ -34,5 +32,6 @@
<classpathentry kind="lib" path="lib/jboss/jboss-logging-spi.jar"/>
<classpathentry kind="lib" path="lib/jbossweb/jbossweb.jar"/>
<classpathentry kind="var" path="ANT_HOME/lib/ant-junit.jar"/>
+ <classpathentry kind="lib" path="lib/apache-commons/lib/commons-logging.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
15 years, 10 months
JBoss Remoting SVN: r4783 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/shutdown.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-01-03 05:28:28 -0500 (Sat, 03 Jan 2009)
New Revision: 4783
Removed:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/shutdown/ShutdownExceptionTestCase.java
Log:
JBREM-1073: Removed test from 2.x branch.
Deleted: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/shutdown/ShutdownExceptionTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/shutdown/ShutdownExceptionTestCase.java 2009-01-01 04:48:01 UTC (rev 4782)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/shutdown/ShutdownExceptionTestCase.java 2009-01-03 10:28:28 UTC (rev 4783)
@@ -1,246 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.test.remoting.shutdown;
-
-import java.net.InetAddress;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.management.MBeanServer;
-
-import junit.framework.TestCase;
-
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
-import org.jboss.remoting.CannotConnectException;
-import org.jboss.remoting.Client;
-import org.jboss.remoting.InvocationRequest;
-import org.jboss.remoting.InvokerLocator;
-import org.jboss.remoting.Remoting;
-import org.jboss.remoting.ServerInvocationHandler;
-import org.jboss.remoting.ServerInvoker;
-import org.jboss.remoting.callback.InvokerCallbackHandler;
-import org.jboss.remoting.transport.Connector;
-import org.jboss.remoting.transport.PortUtil;
-
-/**
- * Unit test for JBREM-1073.
- *
- * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a>
- * @version
- * <p>
- * Copyright Dec 26, 2008
- * </p>
- */
-public class ShutdownExceptionTestCase extends TestCase
-{
- private static Logger log = Logger.getLogger(ShutdownExceptionTestCase.class);
-
- private static boolean firstTime = true;
-
- protected String host;
- protected int port;
- protected String locatorURI;
- protected InvokerLocator serverLocator;
- protected Connector connector;
- protected TestInvocationHandler invocationHandler;
-
-
- public void setUp() throws Exception
- {
- if (firstTime)
- {
- firstTime = false;
- Logger.getLogger("org.jboss.remoting").setLevel(Level.INFO);
- Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
- String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
- PatternLayout layout = new PatternLayout(pattern);
- ConsoleAppender consoleAppender = new ConsoleAppender(layout);
- Logger.getRootLogger().addAppender(consoleAppender);
- }
- }
-
-
- public void tearDown()
- {
- }
-
-
- public void testDefaultBehavior() throws Throwable
- {
- log.info("entering " + getName());
- HashMap config = new HashMap();
- doTestDefaultBehavior(config);
- log.info(getName() + " PASSES");
- }
-
-
- public void testChangeInvalidStateToCannotConnectFalse() throws Throwable
- {
- System.out.println("");
- log.info("entering " + getName());
- HashMap config = new HashMap();
- config.put(Remoting.CHANGE_INVALID_STATE_TO_CANNOT_CONNECT, "false");
- doTestDefaultBehavior(config);
- log.info(getName() + " PASSES");
- }
-
-
- public void testChangeInvalidStateToCannotConnectTrue() throws Throwable
- {
- System.out.println("");
- log.info("entering " + getName());
-
- try
- {
- HashMap config = new HashMap();
- config.put(Remoting.CHANGE_INVALID_STATE_TO_CANNOT_CONNECT, "true");
- doTest(config);
- fail("No Exception: expected CannotConnectException");
- }
- catch (CannotConnectException e)
- {
- log.info("got expected CannotConnectException");
- }
- catch (Throwable t)
- {
- log.error("Expected CannotConnectException", t);
- fail("Expected CannotConnectException: got " + t);
- }
-
- log.info(getName() + " PASSES");
- }
-
-
- /**
- * In Remoting 2.4.0.GA and above, it shouldn't be possible to get a
- * ServerInvoker.InvalidStateException because of the way SocketServerInvoker
- * closes down. Therefore, CannotConnectException is acceptable.
- */
- protected void doTestDefaultBehavior(Map config) throws Throwable
- {
- try
- {
- doTest(config);
- fail("No Exception: expected InvalidStateException");
- }
- catch (ServerInvoker.InvalidStateException e)
- {
- log.info("got expected InvalidStateException");
- }
- catch (CannotConnectException e)
- {
- log.info("OK: got CannotConnectException");
- }
- catch (Throwable t)
- {
- log.error("Expected InvalidStateException", t);
- fail("Expected InvalidStateException: got " + t);
- }
- }
-
-
- protected void doTest(Map config) throws Throwable
- {
- // Start server.
- setupServer();
-
- // Create client.
- InvokerLocator clientLocator = new InvokerLocator(locatorURI);
- config.put(InvokerLocator.FORCE_REMOTE, "true");
- addExtraClientConfig(config);
- Client client = new Client(clientLocator, config);
- client.connect();
- log.info("client is connected");
-
- // Test connection.
- assertEquals("abc", client.invoke("abc"));
- log.info("connection is good");
-
- // Give ServerThread time to start to read version (socket and bisocket transports).
- Thread.sleep(1000);
-
- // Shut down server.
- shutdownServer();
-
- // Try invocation.
- client.invoke("xyz");
-
- client.disconnect();
- }
-
-
- protected String getTransport()
- {
- return "socket";
- }
-
-
- protected void addExtraClientConfig(Map config) {}
- protected void addExtraServerConfig(Map config) {}
-
-
- protected void setupServer() throws Exception
- {
- host = InetAddress.getLocalHost().getHostAddress();
- port = PortUtil.findFreePort(host);
- locatorURI = getTransport() + "://" + host + ":" + port;
- String metadata = System.getProperty("remoting.metadata");
- if (metadata != null)
- {
- locatorURI += "/?" + metadata;
- }
- serverLocator = new InvokerLocator(locatorURI);
- log.info("Starting remoting server with locator uri of: " + locatorURI);
- HashMap config = new HashMap();
- config.put(InvokerLocator.FORCE_REMOTE, "true");
- addExtraServerConfig(config);
- connector = new Connector(serverLocator, config);
- connector.create();
- invocationHandler = new TestInvocationHandler();
- connector.addInvocationHandler("test", invocationHandler);
- connector.start();
- }
-
-
- protected void shutdownServer() throws Exception
- {
- if (connector != null)
- connector.stop();
- }
-
-
- static class TestInvocationHandler implements ServerInvocationHandler
- {
- public void addListener(InvokerCallbackHandler callbackHandler) {}
- public Object invoke(final InvocationRequest invocation) throws Throwable
- {
- return invocation.getParameter();
- }
- public void removeListener(InvokerCallbackHandler callbackHandler) {}
- public void setMBeanServer(MBeanServer server) {}
- public void setInvoker(ServerInvoker invoker) {}
- }
-}
\ No newline at end of file
15 years, 10 months
JBoss Remoting SVN: r4782 - remoting2/tags.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-12-31 23:48:01 -0500 (Wed, 31 Dec 2008)
New Revision: 4782
Added:
remoting2/tags/2.2.2-SP11/
Log:
Copied: remoting2/tags/2.2.2-SP11 (from rev 4781, remoting2/branches/2.2)
15 years, 10 months