January 2010 - jboss-remoting-commits

JBoss Remoting SVN: r5658 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ipv6.

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

Author: ron.sigal(a)jboss.com Date: 2010-01-08 23:20:10 -0500 (Fri, 08 Jan 2010) New Revision: 5658 Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ipv6/IPv6InvokerLocatorTestCase.java Log: JBREM-1175: New unit tests. Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ipv6/IPv6InvokerLocatorTestCase.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ipv6/IPv6InvokerLocatorTestCase.java (rev 0) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/ipv6/IPv6InvokerLocatorTestCase.java 2010-01-09 04:20:10 UTC (rev 5658) @@ -0,0 +1,129 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2009, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt 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.ipv6; + +import java.util.HashMap; +import java.util.Map; + +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.InvokerLocator; +import org.jboss.remoting.transport.Connector; + + +public class IPv6InvokerLocatorTestCase extends TestCase +{ + private static Logger log = Logger.getLogger(IPv6InvokerLocatorTestCase.class); + + private static boolean firstTime = true; + + protected String host; + protected int port; + protected String locatorURI; + protected InvokerLocator serverLocator; + protected Connector connector; + + + 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 testHostWithBrackets() + { + log.info("entering " + getName()); + + Map params = new HashMap(); + params.put("x", "y"); + assertTrue(doTest("socket", "[::]", 1234, "a/b", params, "socket://[::]:1234/a/b?x=y")); + assertTrue(doTest("socket", "[::1]", 1234, "a/b", params, "socket://[::1]:1234/a/b?x=y")); + assertTrue(doTest("socket", "[0:0:0:0:0:0:0:1]", 1234, "a/b", params, "socket://[0:0:0:0:0:0:0:1]:1234/a/b?x=y")); + assertTrue(doTest("socket", "[0:0:0:0:0:0:127.0.0.1]", 1234, "a/b", params, "socket://[0:0:0:0:0:0:127.0.0.1]:1234/a/b?x=y")); + assertTrue(doTest("socket", "[3ffe:1900:4545:3:200:f8ff:fe21:67cf]", 1234, "a/b", params, "socket://[3ffe:1900:4545:3:200:f8ff:fe21:67cf]:1234/a/b?x=y")); + + String version = System.getProperty("java.version"); + if (version.startsWith("1.4")) + { + log.info("java version is " + version + ". Skipping test"); + } + else + { + assertTrue(doTest("socket", "[3ffe:1900:4545:3:200:f8ff:fe21:67cf%5]", 1234, "a/b", params, "socket://[3ffe:1900:4545:3:200:f8ff:fe21:67cf%5]:1234/a/b?x=y")); + } + + log.info(getName() + " PASSES"); + } + + + public void testHostWithoutBrackets() + { + log.info("entering " + getName()); + + Map params = new HashMap(); + params.put("x", "y"); + assertTrue(doTest("socket", "::", 1234, "a/b", params, "socket://[::]:1234/a/b?x=y")); + assertTrue(doTest("socket", "::1", 1234, "a/b", params, "socket://[::1]:1234/a/b?x=y")); + assertTrue(doTest("socket", "0:0:0:0:0:0:0:1", 1234, "a/b", params, "socket://[0:0:0:0:0:0:0:1]:1234/a/b?x=y")); + assertTrue(doTest("socket", "0:0:0:0:0:0:127.0.0.1", 1234, "a/b", params, "socket://[0:0:0:0:0:0:127.0.0.1]:1234/a/b?x=y")); + assertTrue(doTest("socket", "3ffe:1900:4545:3:200:f8ff:fe21:67cf", 1234, "a/b", params, "socket://[3ffe:1900:4545:3:200:f8ff:fe21:67cf]:1234/a/b?x=y")); + + String version = System.getProperty("java.version"); + if (version.startsWith("1.4")) + { + log.info("java version is " + version + ". Skipping test"); + } + else + { + assertTrue(doTest("socket", "3ffe:1900:4545:3:200:f8ff:fe21:67cf%5", 1234, "a/b", params, "socket://[3ffe:1900:4545:3:200:f8ff:fe21:67cf%5]:1234/a/b?x=y")); + } + + log.info(getName() + " PASSES"); + } + + + protected boolean doTest(String protocol, String host, int port, String path, Map params, String expected) + { + + InvokerLocator locator = new InvokerLocator(protocol, host, port, path, params); + log.info(host + " -> " + locator.getLocatorURI()); + return expected.equals(locator.getLocatorURI()); + } +} \ No newline at end of file

14 years, 11 months

1
0
0 / 0

JBoss Remoting SVN: r5657 - remoting2/branches/2.x/src/main/org/jboss/remoting.

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

Author: ron.sigal(a)jboss.com Date: 2010-01-08 23:19:47 -0500 (Fri, 08 Jan 2010) New Revision: 5657 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/InvokerLocator.java Log: JBREM-1175: Added test for IPv6 host addresses to five argument constructor. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/InvokerLocator.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/InvokerLocator.java 2010-01-09 04:19:42 UTC (rev 5656) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/InvokerLocator.java 2010-01-09 04:19:47 UTC (rev 5657) @@ -625,6 +625,12 @@ createHomeLists(this.parameters, homesString, connectHomesString); } + // Test for IPv6 host address. + if (this.host != null && this.host.indexOf(":") >= 0 && this.host.indexOf("[") == -1) + { + this.host = "[" + this.host + "]"; + } + rebuildLocatorURI(); originalURL = uri;

14 years, 11 months

1
0
0 / 0

JBoss Remoting SVN: r5656 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ipv6.

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

Author: ron.sigal(a)jboss.com Date: 2010-01-08 23:19:42 -0500 (Fri, 08 Jan 2010) New Revision: 5656 Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ipv6/IPv6InvokerLocatorTestCase.java Log: JBREM-1175: New unit tests. Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ipv6/IPv6InvokerLocatorTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ipv6/IPv6InvokerLocatorTestCase.java (rev 0) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/ipv6/IPv6InvokerLocatorTestCase.java 2010-01-09 04:19:42 UTC (rev 5656) @@ -0,0 +1,137 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2009, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt 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.ipv6; + +import java.util.HashMap; +import java.util.Map; + +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.InvokerLocator; +import org.jboss.remoting.transport.Connector; + + +/** + * Unit tests for JBREM-1175. + * + * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a> + * @version $Revision: 1.1 $ + * <p> + * Copyright Jan 8, 2010 + */ +public class IPv6InvokerLocatorTestCase extends TestCase +{ + private static Logger log = Logger.getLogger(IPv6InvokerLocatorTestCase.class); + + private static boolean firstTime = true; + + protected String host; + protected int port; + protected String locatorURI; + protected InvokerLocator serverLocator; + protected Connector connector; + + + 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 testHostWithBrackets() + { + log.info("entering " + getName()); + + Map params = new HashMap(); + params.put("x", "y"); + assertTrue(doTest("socket", "[::]", 1234, "a/b", params, "socket://[::]:1234/a/b?x=y")); + assertTrue(doTest("socket", "[::1]", 1234, "a/b", params, "socket://[::1]:1234/a/b?x=y")); + assertTrue(doTest("socket", "[0:0:0:0:0:0:0:1]", 1234, "a/b", params, "socket://[0:0:0:0:0:0:0:1]:1234/a/b?x=y")); + assertTrue(doTest("socket", "[0:0:0:0:0:0:127.0.0.1]", 1234, "a/b", params, "socket://[0:0:0:0:0:0:127.0.0.1]:1234/a/b?x=y")); + assertTrue(doTest("socket", "[3ffe:1900:4545:3:200:f8ff:fe21:67cf]", 1234, "a/b", params, "socket://[3ffe:1900:4545:3:200:f8ff:fe21:67cf]:1234/a/b?x=y")); + + String version = System.getProperty("java.version"); + if (version.startsWith("1.4")) + { + log.info("java version is " + version + ". Skipping test"); + } + else + { + assertTrue(doTest("socket", "[3ffe:1900:4545:3:200:f8ff:fe21:67cf%5]", 1234, "a/b", params, "socket://[3ffe:1900:4545:3:200:f8ff:fe21:67cf%5]:1234/a/b?x=y")); + } + + log.info(getName() + " PASSES"); + } + + + public void testHostWithoutBrackets() + { + log.info("entering " + getName()); + + Map params = new HashMap(); + params.put("x", "y"); + assertTrue(doTest("socket", "::", 1234, "a/b", params, "socket://[::]:1234/a/b?x=y")); + assertTrue(doTest("socket", "::1", 1234, "a/b", params, "socket://[::1]:1234/a/b?x=y")); + assertTrue(doTest("socket", "0:0:0:0:0:0:0:1", 1234, "a/b", params, "socket://[0:0:0:0:0:0:0:1]:1234/a/b?x=y")); + assertTrue(doTest("socket", "0:0:0:0:0:0:127.0.0.1", 1234, "a/b", params, "socket://[0:0:0:0:0:0:127.0.0.1]:1234/a/b?x=y")); + assertTrue(doTest("socket", "3ffe:1900:4545:3:200:f8ff:fe21:67cf", 1234, "a/b", params, "socket://[3ffe:1900:4545:3:200:f8ff:fe21:67cf]:1234/a/b?x=y")); + + String version = System.getProperty("java.version"); + if (version.startsWith("1.4")) + { + log.info("java version is " + version + ". Skipping test"); + } + else + { + assertTrue(doTest("socket", "3ffe:1900:4545:3:200:f8ff:fe21:67cf%5", 1234, "a/b", params, "socket://[3ffe:1900:4545:3:200:f8ff:fe21:67cf%5]:1234/a/b?x=y")); + } + + log.info(getName() + " PASSES"); + } + + + protected boolean doTest(String protocol, String host, int port, String path, Map params, String expected) + { + + InvokerLocator locator = new InvokerLocator(protocol, host, port, path, params); + log.info(host + " -> " + locator.getLocatorURI()); + return expected.equals(locator.getLocatorURI()); + } +} \ No newline at end of file

14 years, 11 months

1
0
0 / 0

JBoss Remoting SVN: r5655 - remoting2/branches/2.2/src/main/org/jboss/remoting.

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

Author: ron.sigal(a)jboss.com Date: 2010-01-08 23:18:10 -0500 (Fri, 08 Jan 2010) New Revision: 5655 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/InvokerLocator.java Log: JBREM-1175: Added test for IPv6 host addresses to five argument constructor. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/InvokerLocator.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/InvokerLocator.java 2010-01-08 22:51:51 UTC (rev 5654) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/InvokerLocator.java 2010-01-09 04:18:10 UTC (rev 5655) @@ -450,6 +450,12 @@ this.port = port; this.path = path; this.parameters = parameters; + + // Test for IPv6 host address. + if (this.host != null && this.host.indexOf(":") >= 0 && this.host.indexOf("[") == -1) + { + this.host = "[" + this.host + "]"; + } this.uri = protocol + "://" + this.host + ((port > -1) ? (":" + port) : "") + "/" + path + ((parameters != null) ? "?" : ""); if(parameters != null)

14 years, 11 months

1
0
0 / 0

JBoss Remoting SVN: r5654 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/invoker.

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

Author: ron.sigal(a)jboss.com Date: 2010-01-08 17:51:51 -0500 (Fri, 08 Jan 2010) New Revision: 5654 Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/invoker/ClientInvokerDelayedDestructionTestCase.java Log: JBREM-1176: Added testConfigByInvokerLocator() from version on branch 2.2. Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/invoker/ClientInvokerDelayedDestructionTestCase.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/invoker/ClientInvokerDelayedDestructionTestCase.java 2010-01-08 22:48:56 UTC (rev 5653) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/invoker/ClientInvokerDelayedDestructionTestCase.java 2010-01-08 22:51:51 UTC (rev 5654) @@ -340,8 +340,44 @@ shutdownServer(); log.info(getName() + " PASSES"); } + + public void testConfigByInvokerLocator() throws Throwable + { + log.info("entering " + getName()); + + // Start server. + setupServer(); + + // Create client. + String clientLocatorURI = locatorURI + "/?invokerDestructionDelay=10000"; + InvokerLocator clientLocator = new InvokerLocator(clientLocatorURI); + HashMap clientConfig = new HashMap(); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + addExtraClientConfig(clientConfig); + Client client = new Client(clientLocator, clientConfig); + client.connect(); + ClientInvoker invoker1 = client.getInvoker(); + + // Test connections. + assertEquals("abc", client.invoke("abc")); + log.info("connection is good for first client"); + client.disconnect(); + + Thread.sleep(5000); + client = new Client(clientLocator, clientConfig); + client.connect(); + ClientInvoker invoker2 = client.getInvoker(); + assertEquals("abc", client.invoke("abc")); + log.info("connection is good for second client"); + assertSame(invoker2, invoker1); + + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + protected String getTransport() { return "socket";

14 years, 11 months

1
0
0 / 0

JBoss Remoting SVN: r5653 - remoting2/branches/2.2/src/main/org/jboss/remoting.

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

Author: ron.sigal(a)jboss.com Date: 2010-01-08 17:48:56 -0500 (Fri, 08 Jan 2010) New Revision: 5653 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/Client.java Log: JBREM-1176: Uses a counter to destroy invoker destruction Timer when there are no more Clients using the facility. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/Client.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/Client.java 2010-01-08 22:46:06 UTC (rev 5652) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/Client.java 2010-01-08 22:48:56 UTC (rev 5653) @@ -179,6 +179,8 @@ private static Timer invokerDestructionTimer; private static Object invokerDestructionTimerLock = new Object(); + + private static int clientCounter; // Static --------------------------------------------------------------------------------------- @@ -678,7 +680,7 @@ { synchronized (invokerDestructionTimerLock) { - InvokerDestructionTimerTask task = new InvokerDestructionTimerTask(invoker); + InvokerDestructionTimerTask task = new InvokerDestructionTimerTask(invoker, configuration); if (invokerDestructionTimer == null) { invokerDestructionTimer = new Timer(true); @@ -1806,6 +1808,14 @@ throw e; } log.debug(this + " connected to " + locator); + if (invokerDestructionDelay > 0) + { + synchronized (invokerDestructionTimerLock) + { + clientCounter++; + log.debug(this + " clientCounter: " + clientCounter); + } + } } else { @@ -2012,22 +2022,33 @@ // Inner classes -------------------------------------------------------------------------------- - class InvokerDestructionTimerTask extends TimerTask + static class InvokerDestructionTimerTask extends TimerTask { - private WeakReference ref; + private ClientInvoker invoker; + private Map config; - public InvokerDestructionTimerTask(ClientInvoker invoker) + public InvokerDestructionTimerTask(ClientInvoker invoker, Map config) { - ref = new WeakReference(invoker); + this.invoker = invoker; + this.config = config; } public void run() { - ClientInvoker invoker = (ClientInvoker) ref.get(); - log.trace(this + " calling InvokerRegistry.destroyClientInvoker() for " + invoker); - InvokerRegistry.destroyClientInvoker(invoker.getLocator(), configuration); - ref.clear(); - ref = null; + log.debug(this + " calling InvokerRegistry.destroyClientInvoker() for " + invoker); + InvokerRegistry.destroyClientInvoker(invoker.getLocator(), config); + + synchronized (invokerDestructionTimerLock) + { + if (--clientCounter == 0) + { + invokerDestructionTimer.cancel(); + invokerDestructionTimer = null; + log.debug(this + " stopped invokerDestructionTimer"); + } + log.debug(this + " clientCounter: " + clientCounter); + } + log.debug(this + "done"); } }

14 years, 11 months

1
0
0 / 0

JBoss Remoting SVN: r5652 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/invoker.

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

Author: ron.sigal(a)jboss.com Date: 2010-01-08 17:46:06 -0500 (Fri, 08 Jan 2010) New Revision: 5652 Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/invoker/ClientInvokerDelayedDestructionTestCase.java Log: JBREM-1176: Updated testStaticTimer() to account for the destruction and recreation of the Timer. Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/invoker/ClientInvokerDelayedDestructionTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/invoker/ClientInvokerDelayedDestructionTestCase.java 2010-01-08 22:14:34 UTC (rev 5651) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/invoker/ClientInvokerDelayedDestructionTestCase.java 2010-01-08 22:46:06 UTC (rev 5652) @@ -51,6 +51,7 @@ /** * Unit tests from JBREM-877. + * Adjusted for JBREM-1176. * * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a> * @version $Revision: 1.1 $ @@ -271,10 +272,11 @@ setupServer(); - // Get static Timer. + // Verify Timer hasn't been created. Field field = Client.class.getDeclaredField("invokerDestructionTimer"); field.setAccessible(true); Timer invokerDestructionTimer = (Timer) field.get(null); + assertNull(invokerDestructionTimer); // Create client. InvokerLocator clientLocator = new InvokerLocator(locatorURI); @@ -292,6 +294,10 @@ clients[i].disconnect(); } + // Verify Timer has been created. + invokerDestructionTimer = (Timer) field.get(null); + assertNotNull(invokerDestructionTimer); + // Verify all Clients are using the same Timer. for (int i = 0; i < 50; i++) { @@ -300,7 +306,37 @@ Thread.sleep(10000); assertEquals(0, InvokerRegistry.getClientInvokers().length); + + // Verify Timer has been destroyed. + invokerDestructionTimer = (Timer) field.get(null); + assertNull(invokerDestructionTimer); + + // Recreate Clients to verify that a new Timer is created. + for (int i = 0; i < 50; i++) + { + clients[i] = new Client(clientLocator, clientConfig); + clients[i].connect(); + assertEquals("abc", clients[i].invoke("abc")); + clients[i].disconnect(); + } + + // Verify Timer has been created. + invokerDestructionTimer = (Timer) field.get(null); + assertNotNull(invokerDestructionTimer); + + // Verify all Clients are using the same Timer. + for (int i = 0; i < 50; i++) + { + assertEquals("Should be the same Timer", invokerDestructionTimer, field.get(clients[i])); + } + Thread.sleep(10000); + assertEquals(0, InvokerRegistry.getClientInvokers().length); + + // Verify Timer has been destroyed. + invokerDestructionTimer = (Timer) field.get(null); + assertNull(invokerDestructionTimer); + shutdownServer(); log.info(getName() + " PASSES"); }

14 years, 11 months

1
0
0 / 0

JBoss Remoting SVN: r5651 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/invoker.

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

Author: ron.sigal(a)jboss.com Date: 2010-01-08 17:14:34 -0500 (Fri, 08 Jan 2010) New Revision: 5651 Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/invoker/ClientInvokerDelayedDestructionTestCase.java Log: JBREM-1176: Added reference to JBREM-1176 to class javadoc. Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/invoker/ClientInvokerDelayedDestructionTestCase.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/invoker/ClientInvokerDelayedDestructionTestCase.java 2010-01-08 22:09:14 UTC (rev 5650) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/invoker/ClientInvokerDelayedDestructionTestCase.java 2010-01-08 22:14:34 UTC (rev 5651) @@ -51,6 +51,7 @@ /** * Unit tests from JBREM-877. + * Adjusted for JBREM-1176. * * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a> * @version $Revision: 1.1 $

14 years, 11 months

1
0
0 / 0

JBoss Remoting SVN: r5650 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/invoker.

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

Author: ron.sigal(a)jboss.com Date: 2010-01-08 17:09:14 -0500 (Fri, 08 Jan 2010) New Revision: 5650 Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/invoker/ClientInvokerDelayedDestructionTestCase.java Log: JBREM-1176: Updated testStaticTimer() to account for the destruction and recreation of the Timer. Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/invoker/ClientInvokerDelayedDestructionTestCase.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/invoker/ClientInvokerDelayedDestructionTestCase.java 2010-01-08 18:28:32 UTC (rev 5649) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/invoker/ClientInvokerDelayedDestructionTestCase.java 2010-01-08 22:09:14 UTC (rev 5650) @@ -271,10 +271,11 @@ setupServer(); - // Get static Timer. + // Verify Timer hasn't been created. Field field = Client.class.getDeclaredField("invokerDestructionTimer"); field.setAccessible(true); Timer invokerDestructionTimer = (Timer) field.get(null); + assertNull(invokerDestructionTimer); // Create client. InvokerLocator clientLocator = new InvokerLocator(locatorURI); @@ -292,6 +293,10 @@ clients[i].disconnect(); } + // Verify Timer has been created. + invokerDestructionTimer = (Timer) field.get(null); + assertNotNull(invokerDestructionTimer); + // Verify all Clients are using the same Timer. for (int i = 0; i < 50; i++) { @@ -300,7 +305,37 @@ Thread.sleep(10000); assertEquals(0, InvokerRegistry.getClientInvokers().length); + + // Verify Timer has been destroyed. + invokerDestructionTimer = (Timer) field.get(null); + assertNull(invokerDestructionTimer); + + // Recreate Clients to verify that a new Timer is created. + for (int i = 0; i < 50; i++) + { + clients[i] = new Client(clientLocator, clientConfig); + clients[i].connect(); + assertEquals("abc", clients[i].invoke("abc")); + clients[i].disconnect(); + } + + // Verify Timer has been created. + invokerDestructionTimer = (Timer) field.get(null); + assertNotNull(invokerDestructionTimer); + + // Verify all Clients are using the same Timer. + for (int i = 0; i < 50; i++) + { + assertEquals("Should be the same Timer", invokerDestructionTimer, field.get(clients[i])); + } + Thread.sleep(10000); + assertEquals(0, InvokerRegistry.getClientInvokers().length); + + // Verify Timer has been destroyed. + invokerDestructionTimer = (Timer) field.get(null); + assertNull(invokerDestructionTimer); + shutdownServer(); log.info(getName() + " PASSES"); }

14 years, 11 months

1
0
0 / 0

JBoss Remoting SVN: r5649 - remoting2/branches/2.x/src/main/org/jboss/remoting.

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

Author: ron.sigal(a)jboss.com Date: 2010-01-08 13:28:32 -0500 (Fri, 08 Jan 2010) New Revision: 5649 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java Log: JBREM-1176: Uses a counter to destroy invoker destruction Timer when there are no more Clients using the facility. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java 2009-12-27 18:26:25 UTC (rev 5648) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java 2010-01-08 18:28:32 UTC (rev 5649) @@ -186,6 +186,8 @@ private static Timer invokerDestructionTimer; private static Object invokerDestructionTimerLock = new Object(); + + private static int clientCounter; // Static --------------------------------------------------------------------------------------- @@ -660,7 +662,7 @@ { synchronized (invokerDestructionTimerLock) { - InvokerDestructionTimerTask task = new InvokerDestructionTimerTask(invoker); + InvokerDestructionTimerTask task = new InvokerDestructionTimerTask(invoker, configuration); if (invokerDestructionTimer == null) { invokerDestructionTimer = new Timer(true); @@ -1798,6 +1800,14 @@ throw e; } log.debug(this + " connected to " + locator); + if (invokerDestructionDelay > 0) + { + synchronized (invokerDestructionTimerLock) + { + clientCounter++; + log.debug(this + " clientCounter: " + clientCounter); + } + } } else { @@ -2062,22 +2072,34 @@ } // Inner classes -------------------------------------------------------------------------------- - class InvokerDestructionTimerTask extends TimerTask + + static class InvokerDestructionTimerTask extends TimerTask { - private WeakReference ref; + private ClientInvoker invoker; + private Map config; - public InvokerDestructionTimerTask(ClientInvoker invoker) + public InvokerDestructionTimerTask(ClientInvoker invoker, Map config) { - ref = new WeakReference(invoker); + this.invoker = invoker; + this.config = config; } public void run() { - ClientInvoker invoker = (ClientInvoker) ref.get(); - log.trace(this + " calling InvokerRegistry.destroyClientInvoker() for " + invoker); - InvokerRegistry.destroyClientInvoker(invoker.getLocator(), configuration); - ref.clear(); - ref = null; + log.debug(this + " calling InvokerRegistry.destroyClientInvoker() for " + invoker); + InvokerRegistry.destroyClientInvoker(invoker.getLocator(), config); + + synchronized (invokerDestructionTimerLock) + { + if (--clientCounter == 0) + { + invokerDestructionTimer.cancel(); + invokerDestructionTimer = null; + log.debug(this + " stopped invokerDestructionTimer"); + } + log.debug(this + " clientCounter: " + clientCounter); + } + log.debug(this + "done"); } }

14 years, 11 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 January 2010