November 2010 - jboss-remoting-commits

JBoss Remoting SVN: r6151 - remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2010-11-13 11:42:27 -0500 (Sat, 13 Nov 2010) New Revision: 6151 Modified: remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/LocalOneArgConnectTestCase.java Log: JBREM-1256: Changed getConnection() to getConnection(String). Modified: remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/LocalOneArgConnectTestCase.java =================================================================== --- remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/LocalOneArgConnectTestCase.java 2010-11-13 16:41:37 UTC (rev 6150) +++ remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/LocalOneArgConnectTestCase.java 2010-11-13 16:42:27 UTC (rev 6151) @@ -30,7 +30,7 @@ @Test(suiteName = "localOneArg") public final class LocalOneArgConnectTestCase extends InvocationTestBase { - protected Connection getConnection() throws IOException { + protected Connection getConnection(String xnioName) throws IOException { return endpoint.connect(URI.create("local:///")).get(); } }

13 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r6150 - remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2010-11-13 11:41:37 -0500 (Sat, 13 Nov 2010) New Revision: 6150 Modified: remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/LocalCallbackTestCase.java Log: JBREM-1256: (1) Uses Random from RemotingRootTestBase; (2) made some protected members public. Modified: remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/LocalCallbackTestCase.java =================================================================== --- remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/LocalCallbackTestCase.java 2010-11-13 16:39:49 UTC (rev 6149) +++ remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/LocalCallbackTestCase.java 2010-11-13 16:41:37 UTC (rev 6150) @@ -53,15 +53,13 @@ @Test(suiteName = "LocalCallback") public class LocalCallbackTestCase extends RemotingLocalTestBase { - protected static final String SERVICE_TYPE = "testservice"; - protected static final String INSTANCE_NAME= "testinstance"; - protected static final String CALLBACK_REQUEST = "callbackRequest"; - protected static final String CALLBACK = "callback"; - protected static final String OK = "ok"; + public static final String SERVICE_TYPE = "testservice"; + public static final String INSTANCE_NAME= "testinstance"; + public static final String CALLBACK_REQUEST = "callbackRequest"; + public static final String CALLBACK = "callback"; + public static final String OK = "ok"; private static final Logger log = Logger.getLogger(LocalCallbackTestCase.class); - - private static int counter; @BeforeMethod public void setUp() { @@ -79,7 +77,7 @@ Client<Object, Object> client = null; try { - int id = counter++; + int id = Math.abs(random.nextInt()); // Set up service. TestRequestListener testRequestListener = new TestRequestListener(); @@ -119,7 +117,7 @@ Client<Object, Object> client = null; try { - int id = counter++; + int id = Math.abs(random.nextInt()); // Set up service. TestRequestListener testRequestListener = new TestRequestListener(); @@ -157,14 +155,14 @@ } } - protected Connection setupConnection(ServerPackage sp) throws IOException, URISyntaxException { + public Connection setupConnection(ServerPackage sp) throws IOException, URISyntaxException { Endpoint endpoint = sp.endpoint; URI uri = new URI(getRemotingScheme() + "://localhost"); Connection connection = getFutureResult(endpoint.connect(uri, getConnectionOptionMap(), "user", null, "password".toCharArray()), "unable to connect to " + uri); return connection; } - protected Client<Object, Object> setupClient(Connection connection, String serviceType, String instanceName) throws IOException, URISyntaxException { + public Client<Object, Object> setupClient(Connection connection, String serviceType, String instanceName) throws IOException, URISyntaxException { Client<Object, Object> client = getFutureResult(connection.openClient(serviceType, instanceName, Object.class, Object.class), "unable to open client to " + serviceType + ":" + instanceName); return client; } @@ -176,7 +174,7 @@ public boolean sentCallback; public TestRequestListener() { - new Exception(this + ": TestRequestListener()").printStackTrace(); +// new Exception(this + ": TestRequestListener()").printStackTrace(); } @SuppressWarnings("unchecked") @@ -201,6 +199,8 @@ sentCallback = OK.equals(callbackClient.invoke(CALLBACK)); requestContext.sendReply(OK); log.info(this + " sent callback using ClientConnector: " + sentCallback); + } else if (request instanceof InvocationTestObject) { + requestContext.sendReply(request); } else { throw new RuntimeException("unexpected request: " + request); }

13 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r6149 - remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2010-11-13 11:39:49 -0500 (Sat, 13 Nov 2010) New Revision: 6149 Modified: remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/InvocationTestBase.java Log: JBREM-1256: Changed getConnection() to getConnection(String); JBREM-1228: added testBasicSendFailureNPE(). Modified: remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/InvocationTestBase.java =================================================================== --- remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/InvocationTestBase.java 2010-11-13 16:35:15 UTC (rev 6148) +++ remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/InvocationTestBase.java 2010-11-13 16:39:49 UTC (rev 6149) @@ -27,6 +27,9 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.io.PrintStream; +import java.util.Date; +import java.util.Random; import java.util.concurrent.atomic.AtomicReference; import org.jboss.remoting3.Client; import org.jboss.remoting3.ClientConnector; @@ -56,14 +59,17 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; @Test public abstract class InvocationTestBase { private static final Logger log = Logger.getLogger("test"); + private static Random random = new Random(new Date().getTime()); protected Endpoint endpoint; + protected String xnioName; @BeforeTest public void setUp() throws IOException { @@ -71,7 +77,11 @@ enter(); try { Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); - endpoint = Remoting.getConfiguredEndpoint(); + String s = "xnio" + String.valueOf(Math.abs(random.nextInt())); + log.info(this + " creating xnio: " + s); + OptionMap optionMap = OptionMap.builder().set(RemotingRootTestBase.XNIO_ID, s).getMap(); + endpoint = Remoting.getConfiguredEndpoint(optionMap); + log.info("created XNIO: " + xnioName); } finally { exit(); } @@ -88,7 +98,7 @@ log.info("-------------------------------------------------------------"); } - protected abstract Connection getConnection() throws Exception; + protected abstract Connection getConnection(String xnioName) throws Exception; public void testBasicInvoke() throws Exception { enter(); @@ -107,7 +117,7 @@ } }).register(); try { - final Connection connection = getConnection(); + final Connection connection = getConnection(String.valueOf(Math.abs(random.nextInt()))); try { final Client<InvocationTestObject, InvocationTestObject> client = connection.openClient("test1", "*", InvocationTestObject.class, InvocationTestObject.class, getClass().getClassLoader(), OptionMap.EMPTY).get(); try { @@ -156,7 +166,7 @@ } }).register(); try { - final Connection connection = getConnection(); + final Connection connection = getConnection(String.valueOf(Math.abs(random.nextInt()))); try { final Client<TypedRequestObject, InvocationTestObject> client = connection.openClient("test1", "*", TypedRequestObject.class, InvocationTestObject.class, getClass().getClassLoader(), OptionMap.EMPTY).get(); try { @@ -195,7 +205,7 @@ } }).register(); try { - final Connection connection = getConnection(); + final Connection connection = getConnection(String.valueOf(Math.abs(random.nextInt()))); try { final Client<InvocationTestObject, InvocationTestObject> client = connection.openClient("test2", "*", InvocationTestObject.class, InvocationTestObject.class).get(); try { @@ -234,7 +244,7 @@ } }).register(); try { - final Connection connection = getConnection(); + final Connection connection = getConnection(String.valueOf(Math.abs(random.nextInt()))); try { final Client<InvocationTestObject, InvocationTestObject> client = connection.openClient("test2", "*", InvocationTestObject.class, InvocationTestObject.class).get(); try { @@ -280,6 +290,73 @@ } } + /** + * Tests for race between handling RemoteProtocol.REQUEST and RemoteProtocol.CLIENT_CLOSE in + * RemoteMessageHandler. See JBREM-1257. + */ + public void testBasicSendFailureNPE() throws Exception { + enter(); + try { + final InvocationTestObject requestObj = new InvocationTestObject(InvocationTestObject.FAILURE); + final InvocationTestObject replyObj = new InvocationTestObject(); + final Registration registration = endpoint.serviceBuilder().setInstanceName("foo").setServiceType("test2").setRequestType(InvocationTestObject.class). + setReplyType(InvocationTestObject.class).setClientListener(new ClientListener<InvocationTestObject, InvocationTestObject>() { + public RequestListener<InvocationTestObject, InvocationTestObject> handleClientOpen(final ClientContext clientContext, final OptionMap optionMap) { + clientContext.addCloseHandler(new CloseHandler<ClientContext>() { + public void handleClose(final ClientContext closed) { + log.debug("Listener closed"); + } + }); + return new TestRequestListener(replyObj); + } + }).register(); + try { + final Connection connection = getConnection(String.valueOf(Math.abs(random.nextInt()))); + try { + final Client<InvocationTestObject, InvocationTestObject> client = connection.openClient("test2", "*", InvocationTestObject.class, InvocationTestObject.class).get(); + try { + log.info("sending FAILURE request"); + PrintStream savedOutPrintStream = System.out; + PrintStream savedERRPrintStream = System.err; + ByteArrayOutputStream baosOut = new ByteArrayOutputStream(); + ByteArrayOutputStream baosErr = new ByteArrayOutputStream(); + System.setOut(new PrintStream(baosOut)); + System.setErr(new PrintStream(baosErr)); + client.send(requestObj); + baosOut.flush(); + baosErr.flush(); + String logOut = baosOut.toString(); + String logErr = baosErr.toString(); + System.setOut(savedOutPrintStream); + System.setErr(savedERRPrintStream); + System.out.println("+++++++++++++++ LOG.OUT +++++++++++++++++++"); + System.out.println(logOut); + System.out.println("+++++++++++++++ LOG.OUT +++++++++++++++++++"); + System.out.println("+++++++++++++++ LOG.ERR +++++++++++++++++++"); + System.out.println(logErr); + System.out.println("+++++++++++++++ LOG.ERR +++++++++++++++++++"); + assertFalse(logOut.contains("NullPointerException")); + assertFalse(logErr.contains("NullPointerException")); + } catch (Exception e) { + fail("didn't expect an exception: " + e.getMessage()); + } + finally { + IoUtils.safeClose(client); + client.awaitClosedUninterruptibly(); + } + } finally { + IoUtils.safeClose(connection); + connection.awaitClosedUninterruptibly(); + } + } finally { + IoUtils.safeClose(registration); + registration.awaitClosedUninterruptibly(); + } + } finally { + exit(); + } + } + public void testBasicSendCancel() throws Exception { enter(); try { @@ -297,7 +374,7 @@ } }).register(); try { - final Connection connection = getConnection(); + final Connection connection = getConnection(String.valueOf(Math.abs(random.nextInt()))); try { final Client<InvocationTestObject, InvocationTestObject> client = connection.openClient("test2", "*", InvocationTestObject.class, InvocationTestObject.class).get(); try { @@ -353,7 +430,7 @@ } }).register(); try { - final Connection connection = getConnection(); + final Connection connection = getConnection(String.valueOf(Math.abs(random.nextInt()))); try { final Client<TypedRequestObject, InvocationTestObject> client = connection.openClient("test2", "*", TypedRequestObject.class, InvocationTestObject.class).get(); try { @@ -403,7 +480,7 @@ } }).register(); try { - final Connection connection = getConnection(); + final Connection connection = getConnection(String.valueOf(Math.abs(random.nextInt()))); try { final Client<ClientConnector, InvocationTestObject> client = connection.openClient("test3", "*", ClientConnector.class, InvocationTestObject.class).get(); try { @@ -451,7 +528,7 @@ public void testNotFoundService() throws Throwable { enter(); try { - final Connection connection = getConnection(); + final Connection connection = getConnection(String.valueOf(Math.abs(random.nextInt()))); try { connection.openClient("blah", "bzzt", Object.class, Object.class).get(); } catch (ServiceNotFoundException e) { @@ -487,7 +564,7 @@ } }).register(); try { - final Connection connection = getConnection(); + final Connection connection = getConnection(String.valueOf(Math.abs(random.nextInt()))); try { final Client<InvocationTestObject, InvocationTestObject> client = connection.openClient("test1", "*", InvocationTestObject.class, InvocationTestObject.class, getClass().getClassLoader(), optionMap).get(); try { @@ -541,7 +618,7 @@ } }).register(); try { - final Connection connection = getConnection(); + final Connection connection = getConnection(String.valueOf(Math.abs(random.nextInt()))); try { final Client<InputStream, InputStream> client = connection.openClient("streamtest", "*", InputStream.class, InputStream.class, InvocationTestBase.class.getClassLoader(), OptionMap.EMPTY).get(); try { @@ -592,7 +669,7 @@ } }).register(); try { - final Connection connection = getConnection(); + final Connection connection = getConnection(String.valueOf(Math.abs(random.nextInt()))); try { final Client<OutputStream, OutputStream> client = connection.openClient("streamtest", "*", OutputStream.class, OutputStream.class, InvocationTestBase.class.getClassLoader(), OptionMap.EMPTY).get(); try { @@ -623,7 +700,7 @@ public void tearDown() throws IOException { enter(); try { - Xnio.getInstance().close(); + Xnio.getInstance(xnioName).close(); System.runFinalization(); } finally { exit();

13 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r6148 - remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2010-11-13 11:35:15 -0500 (Sat, 13 Nov 2010) New Revision: 6148 Modified: remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/EndpointConfigurationTestCase.java Log: JBREM-1256: Uses Random from RemotingRootTestBase and Remoting.getConfiguredEndpoint(OptionMap optionMap). Modified: remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/EndpointConfigurationTestCase.java =================================================================== --- remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/EndpointConfigurationTestCase.java 2010-11-13 16:34:06 UTC (rev 6147) +++ remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/EndpointConfigurationTestCase.java 2010-11-13 16:35:15 UTC (rev 6148) @@ -28,6 +28,7 @@ import java.io.IOException; import java.lang.reflect.Field; import java.net.URI; +import java.util.Map; import java.util.Properties; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.Executor; @@ -77,14 +78,16 @@ private static final Logger log = Logger.getLogger(EndpointConfigurationTestCase.class); + @SuppressWarnings("unchecked") @BeforeMethod public void setUp() { System.clearProperty("remoting.property.file"); try { - Field configuredEndpoint = Remoting.class.getDeclaredField("configuredEndpoint"); - configuredEndpoint.setAccessible(true); - configuredEndpoint.set(null, null); - System.out.println(configuredEndpoint.get(null)); + Field field = Remoting.class.getDeclaredField("configuredEndpoints"); + field.setAccessible(true); + Map<Map<Object, Object>, Endpoint> configuredEndpoints = (Map<Map<Object, Object>, Endpoint>) field.get(null); + configuredEndpoints.clear(); + System.out.println(configuredEndpoints.get(null)); } catch (NoSuchFieldException e) { throw new RuntimeException(e); } catch (IllegalAccessException e) { @@ -176,7 +179,10 @@ enter(); try { - Endpoint endpoint = Remoting.getConfiguredEndpoint(); + String s = "xnio" + String.valueOf(Math.abs(random.nextInt())); + log.info(this + " creating xnio: " + s); + OptionMap optionMap = OptionMap.builder().set(XNIO_ID, s).getMap(); + Endpoint endpoint = Remoting.getConfiguredEndpoint(optionMap); assertSame(MockConnectionProviderFactory.providerInterface, endpoint.getConnectionProviderInterface("mockTransport", MockConnectionProviderFactory.MockProviderInterface.class)); ConnectionProviderContext context = MockConnectionProviderFactory.context; assertTrue(context.getProtocolServiceProvider(ProtocolServiceType.CLASS_EXTERNALIZER_FACTORY, "mockClassExternalizerFactory_sd") instanceof MockClassExternalizerFactory); @@ -200,8 +206,11 @@ try { System.setProperty("remoting.property.file", "protocols.test.remoting.properties"); + String s = "xnio" + String.valueOf(Math.abs(random.nextInt())); + log.info(this + " creating xnio: " + s); + OptionMap optionMap = OptionMap.builder().set(XNIO_ID, s).getMap(); @SuppressWarnings("unused") - Endpoint endpoint = Remoting.getConfiguredEndpoint(); + Endpoint endpoint = Remoting.getConfiguredEndpoint(optionMap); ConnectionProviderContext context = MockConnectionProviderFactory.context; assertTrue(context.getProtocolServiceProvider(ProtocolServiceType.CLASS_EXTERNALIZER_FACTORY, "mockClassExternalizerFactory_pf") instanceof MockClassExternalizerFactory); assertTrue(context.getProtocolServiceProvider(ProtocolServiceType.CLASS_RESOLVER, "mockClassResolver_pf") instanceof MockClassResolver);

13 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r6147 - remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2010-11-13 11:34:06 -0500 (Sat, 13 Nov 2010) New Revision: 6147 Modified: remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/ClientServerRemoteConfigurationTestCase.java Log: JBREM-1256: Uses Random from RemotingRootTestBase and Remoting.getConfiguredEndpoint(OptionMap optionMap). Modified: remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/ClientServerRemoteConfigurationTestCase.java =================================================================== --- remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/ClientServerRemoteConfigurationTestCase.java 2010-11-13 16:29:03 UTC (rev 6146) +++ remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/ClientServerRemoteConfigurationTestCase.java 2010-11-13 16:34:06 UTC (rev 6147) @@ -29,9 +29,7 @@ import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import java.util.Date; import java.util.HashSet; -import java.util.Random; import java.util.ServiceLoader; import org.jboss.remoting3.Client; @@ -42,6 +40,7 @@ import org.jboss.remoting3.RequestContext; import org.jboss.remoting3.RequestListener; import org.jboss.remoting3.spi.RemotingServiceDescriptor; +import org.jboss.xnio.OptionMap; import org.jboss.xnio.log.Logger; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -61,8 +60,6 @@ private static final Logger log = Logger.getLogger(ClientServerRemoteConfigurationTestCase.class); - private static int counter = Math.abs(new Random(new Date().getTime()).nextInt()); - @BeforeMethod public void setUp() { ServiceLoader.load(RemotingServiceDescriptor.class); @@ -86,8 +83,8 @@ ClientSet clients = new ClientSet(); try { - int id0 = counter++; - int id1 = counter++; + int id0 = Math.abs(random.nextInt()); + int id1 = Math.abs(random.nextInt()); // Set up services. TestRequestListener testRequestListener0 = new TestRequestListener(id0); @@ -161,8 +158,8 @@ ClientSet clients = new ClientSet(); try { - int id0 = counter++; - int id1 = counter++; + int id0 = Math.abs(random.nextInt()); + int id1 = Math.abs(random.nextInt()); String serviceType0 = "test" + id0; String instanceName0 = serviceType0; String serviceType1 = "test" + id1; @@ -240,8 +237,8 @@ ClientSet clients = new ClientSet(); try { - int id0 = counter++; - int id1 = counter++; + int id0 = Math.abs(random.nextInt()); + int id1 = Math.abs(random.nextInt()); String serviceType0 = "test" + id0; String instanceName0 = serviceType0; String serviceType1 = "test" + id1; @@ -319,8 +316,8 @@ ClientSet clients = new ClientSet(); try { - int id0 = counter++; - int id1 = counter++; + int id0 = Math.abs(random.nextInt()); + int id1 = Math.abs(random.nextInt()); String serviceType0 = "test" + id0; String instanceName0 = serviceType0; String serviceType1 = "test" + id1; @@ -400,8 +397,8 @@ ClientSet clients = new ClientSet(); try { - int id0 = counter++; - int id1 = counter++; + int id0 = Math.abs(random.nextInt()); + int id1 = Math.abs(random.nextInt()); String serviceType0 = "test" + id0; String serviceType1 = "test" + id1; String instanceName0 = "instance0"; @@ -506,8 +503,8 @@ ClientSet clients = new ClientSet(); try { - int id0 = counter++; - int id1 = counter++; + int id0 = Math.abs(random.nextInt()); + int id1 = Math.abs(random.nextInt()); String serviceType0 = "test" + id0; String serviceType1 = "test" + id1; String instanceName0 = "instance0"; @@ -589,7 +586,10 @@ } protected Connection setupConnection(int port) throws IOException, URISyntaxException { - Endpoint endpoint = Remoting.getConfiguredEndpoint(); + String s = "xnio" + String.valueOf(Math.abs(random.nextInt())); + log.info(this + " creating xnio: " + s); + OptionMap optionMap = OptionMap.builder().set(XNIO_ID, s).getMap(); + Endpoint endpoint = Remoting.getConfiguredEndpoint(optionMap); URI uri = new URI(getRemotingScheme() + "://localhost:" + port); Connection connection = getFutureResult(endpoint.connect(uri, getConnectionOptionMap(), "user", null, "password".toCharArray()), "unable to connect to " + uri); return connection;

13 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r6146 - remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2010-11-13 11:29:03 -0500 (Sat, 13 Nov 2010) New Revision: 6146 Modified: remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/ClientConnectorMisuseTestCase.java Log: JBREM-1256: Uses Random from RemotingRootTestBase and Remoting.getConfiguredEndpoint(OptionMap optionMap). Modified: remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/ClientConnectorMisuseTestCase.java =================================================================== --- remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/ClientConnectorMisuseTestCase.java 2010-11-13 16:26:02 UTC (rev 6145) +++ remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/ClientConnectorMisuseTestCase.java 2010-11-13 16:29:03 UTC (rev 6146) @@ -38,6 +38,7 @@ import org.jboss.remoting3.RequestContext; import org.jboss.remoting3.RequestListener; import org.jboss.remoting3.spi.RemotingServiceDescriptor; +import org.jboss.xnio.OptionMap; import org.jboss.xnio.log.Logger; import org.testng.Assert; import org.testng.annotations.AfterMethod; @@ -57,8 +58,6 @@ private static final Logger log = Logger.getLogger(ClientConnectorMisuseTestCase.class); - private static int counter; - @BeforeMethod public void setUp() { ServiceLoader.load(RemotingServiceDescriptor.class); @@ -79,7 +78,7 @@ Client<Object, Object> client = null; try { - int id = counter++; + int id = Math.abs(random.nextInt()); // Set up services. TestRequestListener testRequestListener = new TestRequestListener(id); @@ -122,7 +121,10 @@ } protected Connection setupConnection(int port) throws IOException, URISyntaxException { - Endpoint endpoint = Remoting.getConfiguredEndpoint(); + String s = "xnio" + String.valueOf(Math.abs(random.nextInt())); + log.info(this + " creating xnio: " + s); + OptionMap optionMap = OptionMap.builder().set(XNIO_ID, s).getMap(); + Endpoint endpoint = Remoting.getConfiguredEndpoint(optionMap); URI uri = new URI(getRemotingScheme() + "://localhost:" + port); Connection connection = getFutureResult(endpoint.connect(uri, getConnectionOptionMap(), "user", null, "password".toCharArray()), "unable to connect to " + uri); return connection;

13 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r6145 - remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2010-11-13 11:26:02 -0500 (Sat, 13 Nov 2010) New Revision: 6145 Modified: remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/AbstractRemoteTestCase.java Log: JBREM-1256: Changed Xnio.getInstance() to Xnio.getInstance(xnioName). Modified: remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/AbstractRemoteTestCase.java =================================================================== --- remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/AbstractRemoteTestCase.java 2010-11-13 16:24:35 UTC (rev 6144) +++ remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/AbstractRemoteTestCase.java 2010-11-13 16:26:02 UTC (rev 6145) @@ -52,14 +52,14 @@ authenticationProvider.addUser("user", "endpoint", "password".toCharArray()); } - protected Connection getConnection() throws Exception { + protected Connection getConnection(String xnioName) throws Exception { final NetworkServerProvider provider = endpoint.getConnectionProviderInterface(getScheme(), NetworkServerProvider.class); assertNotNull(provider, "No remote provider interface"); final OptionMap serverOptions = OptionMap.builder() .setSequence(Options.SASL_MECHANISMS, "EXTERNAL", "DIGEST-MD5") .getMap(); final ChannelListener<ConnectedStreamChannel<InetSocketAddress>> listener = provider.getServerListener(serverOptions, authenticationProvider); - final Xnio xnio = Xnio.getInstance(); + final Xnio xnio = Xnio.getInstance(xnioName); final AcceptingServer<InetSocketAddress, ?, ?> server = getServer(listener, xnio); final IoFuture<? extends BoundChannel<InetSocketAddress>> future = server.bind(new InetSocketAddress(InetAddress.getByName("127.0.0.1"), 0)); final InetSocketAddress localAddress = future.get().getLocalAddress();

13 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r6144 - 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-13 11:24:35 -0500 (Sat, 13 Nov 2010) New Revision: 6144 Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/Remoting.java Log: JBREM-1256: (1) Added getConfiguredEndpoint(OptionMap optionMap); (2) keeps a map from OptionMap to created EndPoints. Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/Remoting.java =================================================================== --- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/Remoting.java 2010-11-13 00:55:53 UTC (rev 6143) +++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/Remoting.java 2010-11-13 16:24:35 UTC (rev 6144) @@ -30,6 +30,7 @@ import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Properties; @@ -65,8 +66,8 @@ private static final Logger log = Logger.getLogger("org.jboss.remoting"); - private static Endpoint configuredEndpoint; private static final Object lock = new Object(); + private static final Map<OptionMap, Endpoint> configuredEndpoints = new HashMap<OptionMap, Endpoint>(); private static final RemotingPermission CREATE_ENDPOINT_PERM = new RemotingPermission("createEndpoint"); private static final RemotingPermission GET_CONFIGURED_ENDPOINT_PERM = new RemotingPermission("getConfiguredEndpoint"); @@ -92,20 +93,29 @@ }; public static Endpoint getConfiguredEndpoint() throws IOException { - final SecurityManager sm = System.getSecurityManager(); - if (sm != null) { - sm.checkPermission(GET_CONFIGURED_ENDPOINT_PERM); - } - synchronized (lock) { - final Endpoint endpoint = configuredEndpoint; - if (endpoint != null) { - return endpoint; - } - return configuredEndpoint = createConfigured(); - } + return getConfiguredEndpoint(OptionMap.EMPTY); } + + public static Endpoint getConfiguredEndpoint(OptionMap optionMap) throws IOException { + if (optionMap == null) { + throw new NullPointerException("map is null"); + } + final SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(GET_CONFIGURED_ENDPOINT_PERM); + } + synchronized (lock) { + final Endpoint endpoint = configuredEndpoints.get(optionMap); + if (endpoint != null) { + return endpoint; + } + Endpoint configuredEndpoint = createConfigured(optionMap); + configuredEndpoints.put(optionMap, configuredEndpoint); + return configuredEndpoint; + } + } - private static Endpoint createConfigured() throws IOException { + private static Endpoint createConfigured(final OptionMap optionMap) throws IOException { try { return AccessController.doPrivileged(new PrivilegedAction<Endpoint>() { public Endpoint run() { @@ -132,6 +142,10 @@ } catch (IOException e) { throw new RuntimeException(e); } + for (Iterator<Option<?>> it = optionMap.iterator(); it.hasNext();) { + Option<?> key = it.next(); + props.put(key.getName(), optionMap.get(key)); + } final ThreadPoolExecutor executor = new ThreadPoolExecutor( Integer.parseInt(props.getProperty("endpoint.threadpool.coresize", "8")), Integer.parseInt(props.getProperty("endpoint.threadpool.maxsize", "64")),

13 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r6143 - remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2010-11-12 19:55:53 -0500 (Fri, 12 Nov 2010) New Revision: 6143 Modified: remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/RemoteClassTableWrapper.java Log: JBREM-1228: Changed new RemoteClassTable() to new RemoteClassTable(null); Modified: remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/RemoteClassTableWrapper.java =================================================================== --- remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/RemoteClassTableWrapper.java 2010-11-13 00:48:45 UTC (rev 6142) +++ remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/RemoteClassTableWrapper.java 2010-11-13 00:55:53 UTC (rev 6143) @@ -55,7 +55,7 @@ } public RemoteClassTableWrapper() { - remoteClassTable = new RemoteClassTable(); + remoteClassTable = new RemoteClassTable(null); } public Writer getClassWriter(Class<?> clazz) throws IOException {

13 years, 5 months

1
0
0 / 0

JBoss Remoting SVN: r6142 - remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2010-11-12 19:48:45 -0500 (Fri, 12 Nov 2010) New Revision: 6142 Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/ReaderInputStream.java Log: JBREM-1252: (1) Added byteBuffer.flip() and charBuffer.flip() to the constructor; (2) fixed fill(). Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/ReaderInputStream.java =================================================================== --- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/ReaderInputStream.java 2010-11-13 00:21:50 UTC (rev 6141) +++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/ReaderInputStream.java 2010-11-13 00:48:45 UTC (rev 6142) @@ -98,6 +98,8 @@ this.encoder = encoder; charBuffer = CharBuffer.wrap(new char[bufferSize]); byteBuffer = ByteBuffer.wrap(new byte[(int) ((float)bufferSize * encoder.averageBytesPerChar() + 0.5f)]); + charBuffer.flip(); + byteBuffer.flip(); } private static CharsetEncoder getEncoder(final Charset charset) { @@ -165,7 +167,7 @@ try { final int cnt = reader.read(charBuffer); if (cnt == -1) { - return false; + return byteBuffer.position() > 0; } } finally { charBuffer.flip();

13 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jboss-remoting-commits November 2010