July 2009 - jboss-remoting-commits

JBoss Remoting SVN: r5309 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/marshall/compress.

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

Author: ron.sigal(a)jboss.com Date: 2009-07-27 22:19:48 -0400 (Mon, 27 Jul 2009) New Revision: 5309 Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/marshall/compress/NewCompressingMarshallerTestCase.java Log: JBREM-1077: New unit test. Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/marshall/compress/NewCompressingMarshallerTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/marshall/compress/NewCompressingMarshallerTestCase.java (rev 0) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/marshall/compress/NewCompressingMarshallerTestCase.java 2009-07-28 02:19:48 UTC (rev 5309) @@ -0,0 +1,198 @@ +/* +* 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.marshall.compress; + +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.Client; +import org.jboss.remoting.InvocationRequest; +import org.jboss.remoting.InvokerLocator; +import org.jboss.remoting.ServerInvocationHandler; +import org.jboss.remoting.ServerInvoker; +import org.jboss.remoting.callback.Callback; +import org.jboss.remoting.callback.HandleCallbackException; +import org.jboss.remoting.callback.InvokerCallbackHandler; +import org.jboss.remoting.marshal.MarshalFactory; +import org.jboss.remoting.marshal.compress.CompressingMarshaller; +import org.jboss.remoting.marshal.compress.CompressingUnMarshaller; +import org.jboss.remoting.transport.Connector; +import org.jboss.remoting.transport.PortUtil; + + +/** + * Unit test for JBREM-1077. + * + * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a> + * @version $Rev$ + * + * Copyright Jul 27, 2009 + * + */ +public class NewCompressingMarshallerTestCase extends TestCase +{ + private static Logger log = Logger.getLogger(NewCompressingMarshallerTestCase.class); + + private static boolean firstTime = true; + private static char[] digits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; + private static int COUNT = 10000; + + 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); + + MarshalFactory.addMarshaller(CompressingMarshaller.DATATYPE, + new CompressingMarshaller(), + new CompressingUnMarshaller()); + } + } + + + public void tearDown() + { + } + + + public void testCompression() throws Throwable + { + log.info("entering " + getName()); + + // Start server. + setupServer(); + + // Create client. + InvokerLocator clientLocator = new InvokerLocator(locatorURI); + HashMap clientConfig = new HashMap(); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + addExtraClientConfig(clientConfig); + Client client = new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + + // Test connection. + assertEquals("abc", client.invoke("abc")); + log.info("connection is good"); + + StringBuffer sb = new StringBuffer(); + for (int i = 0; i < COUNT; i++) + { + String msg = sb.append(digits[i % 10]).toString(); + Object response = client.invoke(msg); + assertEquals("error on invocation " + i, msg, response); + if (i % (COUNT / 10) == 0) + { + log.info("OK: " + i); + } + } + + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + + + 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 + "/?datatype=" + CompressingMarshaller.DATATYPE; + 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) {} + } + + + static class TestCallbackHandler implements InvokerCallbackHandler + { + public void handleCallback(Callback callback) throws HandleCallbackException + { + log.info("received callback"); + } + } +} \ No newline at end of file

14 years, 9 months

1
0
0 / 0

JBoss Remoting SVN: r5308 - remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/compress.

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

Author: ron.sigal(a)jboss.com Date: 2009-07-27 22:18:42 -0400 (Mon, 27 Jul 2009) New Revision: 5308 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/compress/CompressingMarshaller.java remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/compress/CompressingUnMarshaller.java Log: JBREM-1077: Made changes suggested by Doychin Bondzhev. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/compress/CompressingMarshaller.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/compress/CompressingMarshaller.java 2009-07-28 02:14:09 UTC (rev 5307) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/compress/CompressingMarshaller.java 2009-07-28 02:18:42 UTC (rev 5308) @@ -27,6 +27,7 @@ import org.jboss.remoting.marshal.serializable.SerializableMarshaller; import org.jboss.remoting.serialization.SerializationStreamFactory; +import java.io.BufferedOutputStream; import java.io.IOException; import java.io.ObjectOutputStream; import java.io.OutputStream; @@ -89,9 +90,9 @@ public void write(Object dataObject, OutputStream output, int version) throws IOException { output.flush(); - ; - GZIPOutputStream gzos = new GZIPOutputStream(output); - ObjectOutputStream oos = SerializationStreamFactory.getManagerInstance(getSerializationType()).createOutput(gzos); + GZIPOutputStream gzos = new SelfCleaningGZipOutputStream(output); + BufferedOutputStream bos = new BufferedOutputStream(gzos); + ObjectOutputStream oos = SerializationStreamFactory.getManagerInstance(getSerializationType()).createOutput(bos); if(wrappedMarshaller != null) { @@ -105,8 +106,10 @@ super.write(dataObject, oos, version); } + oos.flush(); + bos.flush(); gzos.finish(); - oos.flush(); + gzos.flush(); } /** @@ -119,6 +122,27 @@ { return new CompressingMarshaller(wrappedMarshaller); } + + + /** + * @author Doychin Bondzhev + */ + static class SelfCleaningGZipOutputStream extends GZIPOutputStream + { + public SelfCleaningGZipOutputStream(OutputStream out) throws IOException + { + super(out); + } + /** + * Writes remaining compressed data to the output stream and closes the underlying stream. + * @exception IOException if an I/O error has occurred + */ + public void finish() throws IOException + { + super.finish(); + def.end(); // This will release all resources used by zlib native code + } + } } Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/compress/CompressingUnMarshaller.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/compress/CompressingUnMarshaller.java 2009-07-28 02:14:09 UTC (rev 5307) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/compress/CompressingUnMarshaller.java 2009-07-28 02:18:42 UTC (rev 5308) @@ -25,8 +25,10 @@ import org.jboss.remoting.marshal.UnMarshaller; import org.jboss.remoting.marshal.VersionedUnMarshaller; import org.jboss.remoting.marshal.serializable.SerializableUnMarshaller; +import org.jboss.remoting.serialization.SerializationManager; import org.jboss.remoting.serialization.SerializationStreamFactory; +import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; @@ -94,19 +96,28 @@ */ public Object read(InputStream inputStream, Map metadata, int version) throws IOException, ClassNotFoundException { - GZIPInputStream gzis = new GZIPInputStream(inputStream); - ObjectInputStream ois = SerializationStreamFactory.getManagerInstance(getSerializationType()).createRegularInput(gzis); + SelfCleaningGZipInputStream gzis = new SelfCleaningGZipInputStream(inputStream); + BufferedInputStream bis = new BufferedInputStream(gzis); + SerializationManager manager = SerializationStreamFactory.getManagerInstance(getSerializationType()); + ObjectInputStream ois = manager.createRegularInput(bis); - if(wrappedUnMarshaller != null) + try { - if (wrappedUnMarshaller instanceof VersionedUnMarshaller) - return ((VersionedUnMarshaller)wrappedUnMarshaller).read(ois, metadata, version); + if(wrappedUnMarshaller != null) + { + if (wrappedUnMarshaller instanceof VersionedUnMarshaller) + return ((VersionedUnMarshaller)wrappedUnMarshaller).read(ois, metadata, version); + else + return wrappedUnMarshaller.read(ois, metadata); + } else - return wrappedUnMarshaller.read(ois, metadata); + { + return super.read(ois, metadata, version); + } } - else + finally { - return super.read(ois, metadata, version); + gzis.end(); } } @@ -122,5 +133,25 @@ return new CompressingUnMarshaller(wrappedUnMarshaller); } + + /** + * @author Doychin Bondzhev + */ + static class SelfCleaningGZipInputStream extends GZIPInputStream + { + public SelfCleaningGZipInputStream(InputStream in) throws IOException + { + super(in); + } + + public void end() throws IOException + { + while(available() > 0) { // This will force input stream to read gzip trailer from input stream + read(); + } + inf.end(); // TO release resources used by native code + } + } + }

14 years, 9 months

1
0
0 / 0

JBoss Remoting SVN: r5307 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/compress.

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

Author: ron.sigal(a)jboss.com Date: 2009-07-27 22:14:09 -0400 (Mon, 27 Jul 2009) New Revision: 5307 Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/compress/NewCompressingMarshallerTestCase.java Log: JBREM-1077: New unit test. Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/compress/NewCompressingMarshallerTestCase.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/compress/NewCompressingMarshallerTestCase.java (rev 0) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/compress/NewCompressingMarshallerTestCase.java 2009-07-28 02:14:09 UTC (rev 5307) @@ -0,0 +1,198 @@ +/* +* 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.marshall.compress; + +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.Client; +import org.jboss.remoting.InvocationRequest; +import org.jboss.remoting.InvokerLocator; +import org.jboss.remoting.ServerInvocationHandler; +import org.jboss.remoting.ServerInvoker; +import org.jboss.remoting.callback.Callback; +import org.jboss.remoting.callback.HandleCallbackException; +import org.jboss.remoting.callback.InvokerCallbackHandler; +import org.jboss.remoting.marshal.MarshalFactory; +import org.jboss.remoting.marshal.compress.CompressingMarshaller; +import org.jboss.remoting.marshal.compress.CompressingUnMarshaller; +import org.jboss.remoting.transport.Connector; +import org.jboss.remoting.transport.PortUtil; + + +/** + * Unit test for JBREM-1077. + * + * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a> + * @version $Rev$ + * + * Copyright Jul 27, 2009 + * + */ +public class NewCompressingMarshallerTestCase extends TestCase +{ + private static Logger log = Logger.getLogger(NewCompressingMarshallerTestCase.class); + + private static boolean firstTime = true; + private static char[] digits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; + private static int COUNT = 10000; + + 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); + + MarshalFactory.addMarshaller(CompressingMarshaller.DATATYPE, + new CompressingMarshaller(), + new CompressingUnMarshaller()); + } + } + + + public void tearDown() + { + } + + + public void testCompression() throws Throwable + { + log.info("entering " + getName()); + + // Start server. + setupServer(); + + // Create client. + InvokerLocator clientLocator = new InvokerLocator(locatorURI); + HashMap clientConfig = new HashMap(); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + addExtraClientConfig(clientConfig); + Client client = new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + + // Test connection. + assertEquals("abc", client.invoke("abc")); + log.info("connection is good"); + + StringBuffer sb = new StringBuffer(); + for (int i = 0; i < COUNT; i++) + { + String msg = sb.append(digits[i % 10]).toString(); + Object response = client.invoke(msg); + assertEquals("error on invocation " + i, msg, response); + if (i % (COUNT / 10) == 0) + { + log.info("OK: " + i); + } + } + + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + + + 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 + "/?datatype=" + CompressingMarshaller.DATATYPE; + 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) {} + } + + + static class TestCallbackHandler implements InvokerCallbackHandler + { + public void handleCallback(Callback callback) throws HandleCallbackException + { + log.info("received callback"); + } + } +} \ No newline at end of file

14 years, 9 months

1
0
0 / 0

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

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

Author: ron.sigal(a)jboss.com Date: 2009-07-27 22:13:08 -0400 (Mon, 27 Jul 2009) New Revision: 5306 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/marshal/compress/CompressingMarshaller.java remoting2/branches/2.x/src/main/org/jboss/remoting/marshal/compress/CompressingUnMarshaller.java Log: JBREM-1077: Made changes suggested by Doychin Bondzhev. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/marshal/compress/CompressingMarshaller.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/marshal/compress/CompressingMarshaller.java 2009-07-08 01:53:38 UTC (rev 5305) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/marshal/compress/CompressingMarshaller.java 2009-07-28 02:13:08 UTC (rev 5306) @@ -95,8 +95,7 @@ public void write(Object dataObject, OutputStream output, int version) throws IOException { output.flush(); - ; - GZIPOutputStream gzos = new GZIPOutputStream(output); + GZIPOutputStream gzos = new SelfCleaningGZipOutputStream(output); BufferedOutputStream bos = new BufferedOutputStream(gzos); ObjectOutputStream oos = SerializationStreamFactory.getManagerInstance(getSerializationType()).createOutput(bos); @@ -114,8 +113,8 @@ oos.flush(); bos.flush(); + gzos.finish(); gzos.flush(); - gzos.finish(); } @@ -129,6 +128,27 @@ { return new CompressingMarshaller(wrappedMarshaller); } + + + /** + * @author Doychin Bondzhev + */ + static class SelfCleaningGZipOutputStream extends GZIPOutputStream + { + public SelfCleaningGZipOutputStream(OutputStream out) throws IOException + { + super(out); + } + /** + * Writes remaining compressed data to the output stream and closes the underlying stream. + * @exception IOException if an I/O error has occurred + */ + public void finish() throws IOException + { + super.finish(); + def.end(); // This will release all resources used by zlib native code + } + } } Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/marshal/compress/CompressingUnMarshaller.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/marshal/compress/CompressingUnMarshaller.java 2009-07-08 01:53:38 UTC (rev 5305) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/marshal/compress/CompressingUnMarshaller.java 2009-07-28 02:13:08 UTC (rev 5306) @@ -104,31 +104,38 @@ */ public Object read(InputStream inputStream, Map metadata, int version) throws IOException, ClassNotFoundException { - GZIPInputStream gzis = new GZIPInputStream(inputStream); + SelfCleaningGZipInputStream gzis = new SelfCleaningGZipInputStream(inputStream); BufferedInputStream bis = new BufferedInputStream(gzis); SerializationManager manager = SerializationStreamFactory.getManagerInstance(getSerializationType()); ObjectInputStream ois = manager.createInput(bis, getClassLoader()); - if(wrappedUnMarshaller != null) + try { - // HACK for JBREM-927. - if (wrappedUnMarshaller instanceof HTTPUnMarshaller) + if(wrappedUnMarshaller != null) { - Map map = new HashMap(); - if (metadata != null) - map.putAll(metadata); - map.put("Content-Length", Integer.toString(Integer.MAX_VALUE)); - metadata = map; + // HACK for JBREM-927. + if (wrappedUnMarshaller instanceof HTTPUnMarshaller) + { + Map map = new HashMap(); + if (metadata != null) + map.putAll(metadata); + map.put("Content-Length", Integer.toString(Integer.MAX_VALUE)); + metadata = map; + } + + if (wrappedUnMarshaller instanceof VersionedUnMarshaller) + return ((VersionedUnMarshaller)wrappedUnMarshaller).read(ois, metadata, version); + else + return wrappedUnMarshaller.read(ois, metadata); } - - if (wrappedUnMarshaller instanceof VersionedUnMarshaller) - return ((VersionedUnMarshaller)wrappedUnMarshaller).read(ois, metadata, version); else - return wrappedUnMarshaller.read(ois, metadata); + { + return super.read(ois, metadata, version); + } } - else + finally { - return super.read(ois, metadata, version); + gzis.end(); } } @@ -144,5 +151,25 @@ return new CompressingUnMarshaller(wrappedUnMarshaller); } + + /** + * @author Doychin Bondzhev + */ + static class SelfCleaningGZipInputStream extends GZIPInputStream + { + public SelfCleaningGZipInputStream(InputStream in) throws IOException + { + super(in); + } + + public void end() throws IOException + { + while(available() > 0) { // This will force input stream to read gzip trailer from input stream + read(); + } + inf.end(); // TO release resources used by native code + } + } + }

14 years, 9 months

1
0
0 / 0

JBoss Remoting SVN: r5305 - remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket.

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

Author: david.lloyd(a)jboss.com Date: 2009-07-07 21:53:38 -0400 (Tue, 07 Jul 2009) New Revision: 5305 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java Log: Make the JBREM-1140 change safe for 1.4 - just in case Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java 2009-07-08 00:09:13 UTC (rev 5304) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java 2009-07-08 01:53:38 UTC (rev 5305) @@ -207,8 +207,8 @@ val = configuration.get(Bisocket.ENABLE_PING_REPLIES); if (val != null) { - // parseBoolean doesn't throw exceptions :-) - boolean bVal = Boolean.parseBoolean((String) val); + // Boolean.valueOf doesn't throw exceptions :-) + boolean bVal = Boolean.valueOf((String) val).booleanValue(); enablePingReplies = bVal; } } Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java 2009-07-08 00:09:13 UTC (rev 5304) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java 2009-07-08 01:53:38 UTC (rev 5305) @@ -206,8 +206,8 @@ Object val = configuration.get(Bisocket.ENABLE_PING_REPLIES); if (val != null) { - // parseBoolean doesn't throw exceptions :-) - boolean bVal = Boolean.parseBoolean((String) val); + // Boolean.valueOf doesn't throw exceptions :-) + boolean bVal = Boolean.valueOf((String) val).booleanValue(); enablePingReplies = bVal; } }

14 years, 9 months

1
0
0 / 0

JBoss Remoting SVN: r5304 - remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket.

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

Author: david.lloyd(a)jboss.com Date: 2009-07-07 20:09:13 -0400 (Tue, 07 Jul 2009) New Revision: 5304 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/Bisocket.java remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java Log: JBREM-1140 - Add an "enablePingReplies" config option which causes the server to reply to bisocket control socket pings Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/Bisocket.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/Bisocket.java 2009-07-08 00:05:49 UTC (rev 5303) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/Bisocket.java 2009-07-08 00:09:13 UTC (rev 5304) @@ -53,8 +53,15 @@ */ public static final String PING_WINDOW_FACTOR = "pingWindowFactor"; public static final int PING_WINDOW_FACTOR_DEFAULT = 2; - + /** + * Configuration key for enabling ping replies, so that the client can more + * actively detect connection death. Must be enabled on both client and + * server. + */ + public static final String ENABLE_PING_REPLIES = "enablePingReplies"; + + /** * Configuration key and default value for number of retries * BisocketServerInvoker.ControlConnectionThread and * BisocketServerInvoker.createControlConnection should attempt while creating Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java 2009-07-08 00:05:49 UTC (rev 5303) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java 2009-07-08 00:09:13 UTC (rev 5304) @@ -24,6 +24,7 @@ import java.io.IOException; import java.io.OutputStream; +import java.io.InputStream; import java.lang.reflect.Method; import java.net.Socket; import java.util.Collections; @@ -84,12 +85,13 @@ private int maxRetries = Bisocket.MAX_RETRIES_DEFAULT; private Socket controlSocket; private OutputStream controlOutputStream; + private InputStream controlInputStream; private Object controlLock = new Object(); private PingTimerTask pingTimerTask; protected boolean isCallbackInvoker; protected BooleanHolder pingFailed = new BooleanHolder(false); + private boolean enablePingReplies = false; - /** * @param listenerId * @return @@ -201,6 +203,14 @@ " value of " + val + " to an int value."); } } + + val = configuration.get(Bisocket.ENABLE_PING_REPLIES); + if (val != null) + { + // parseBoolean doesn't throw exceptions :-) + boolean bVal = Boolean.parseBoolean((String) val); + enablePingReplies = bVal; + } } } @@ -277,6 +287,7 @@ try { controlOutputStream = controlSocket.getOutputStream(); + controlInputStream = controlSocket.getInputStream(); } catch (IOException e1) { @@ -522,6 +533,7 @@ controlSocket = socket; log.debug(this + " control socket replaced by: " + socket); controlOutputStream = controlSocket.getOutputStream(); + controlInputStream = controlSocket.getInputStream(); } if (pingTimerTask != null) @@ -604,18 +616,16 @@ { private Object controlLock; private OutputStream controlOutputStream; - private int maxRetries; - private Exception savedException; - private boolean pingSent; + private InputStream controlInputStream; private BooleanHolder pingFailed; - + private boolean enablePingReplies; + PingTimerTask(BisocketClientInvoker invoker) { controlLock = invoker.controlLock; controlOutputStream = invoker.controlOutputStream; - maxRetries = invoker.getMaxRetries(); - pingFailed = invoker.pingFailed; - pingFailed.flag = false; + controlInputStream = invoker.controlInputStream; + enablePingReplies = invoker.enablePingReplies; } public void shutDown() @@ -623,6 +633,7 @@ synchronized (controlLock) { controlOutputStream = null; + controlInputStream = null; } cancel(); try @@ -637,42 +648,54 @@ } public void run() - { - pingSent = false; - - for (int i = 0; i < maxRetries; i++) + { + boolean ok = false; + try { - try + synchronized (controlLock) { - synchronized (controlLock) + if (controlOutputStream == null || controlInputStream == null) + return; + + controlOutputStream.write(Bisocket.PING); + if (enablePingReplies) { - if (controlOutputStream == null) + int rep = controlInputStream.read(); + if (rep == -1) + { + // socket was closed! + shutDown(); return; - - controlOutputStream.write(Bisocket.PING); + } + if (rep != Bisocket.PING) + { + // um - protocol error + log.warn("Protocol error: received unexpected reply to ping on control socket (are ping replies enabled on the server?); shutting down PingTimerTask"); + shutDown(); + return; + } } - pingSent = true; - break; + ok = true; } - catch (Exception e) + } + catch (Exception e) + { + log.warn("Unable to send ping: shutting down PingTimerTask", e); + } + finally + { + if (! ok) { - savedException = e; - log.debug("Unable to send ping: trying again"); + pingFailed.flag = true; + shutDown(); } } - - if (!pingSent) - { - log.warn("Unable to send ping: shutting down PingTimerTask", savedException); - pingFailed.flag = true; - shutDown(); - } } } static class BooleanHolder { - public boolean flag; + public volatile boolean flag; public BooleanHolder(boolean flag) { Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java 2009-07-08 00:05:49 UTC (rev 5303) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java 2009-07-08 00:09:13 UTC (rev 5304) @@ -82,6 +82,7 @@ private int socketCreationRetries = Bisocket.MAX_RETRIES_DEFAULT; private int controlConnectionRestarts = Bisocket.MAX_CONTROL_CONNECTION_RESTARTS_DEFAULT; private ControlMonitorTimerTask controlMonitorTimerTask; + private boolean enablePingReplies = false; protected boolean isCallbackServer = false; protected int secondaryBindPort = -1; protected int secondaryConnectPort = -1; @@ -202,6 +203,13 @@ secondaryServerSocketThread.start(); log.debug("started secondary port: " + host + ":" + secondaryBindPort); } + Object val = configuration.get(Bisocket.ENABLE_PING_REPLIES); + if (val != null) + { + // parseBoolean doesn't throw exceptions :-) + boolean bVal = Boolean.parseBoolean((String) val); + enablePingReplies = bVal; + } } @@ -799,6 +807,10 @@ break; case Bisocket.PING: + if (enablePingReplies) + { + socket.getOutputStream().write(Bisocket.PING); + } continue; case -1:

14 years, 9 months

1
0
0 / 0

JBoss Remoting SVN: r5303 - in remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport: socket/ssl/serversocketrefresh and 1 other directory.

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

Author: david.lloyd(a)jboss.com Date: 2009-07-07 20:05:49 -0400 (Tue, 07 Jul 2009) New Revision: 5303 Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/multiplex/ssl/serversocketrefresh/TestServer.java remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ssl/serversocketrefresh/TestServer.java Log: Fix invalid characters (javadoc) Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/multiplex/ssl/serversocketrefresh/TestServer.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/multiplex/ssl/serversocketrefresh/TestServer.java 2009-07-07 23:47:10 UTC (rev 5302) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/multiplex/ssl/serversocketrefresh/TestServer.java 2009-07-08 00:05:49 UTC (rev 5303) @@ -300,7 +300,7 @@ /** * overrides createServerSocket methods from class SSLServerSocketFactory * sets NeedClientAuth true, so server asks for a client certificate in the SSL handshake - * @author <a href="mailto:michael.voss@hp.com">Michael Vo�</a> + * @author <a href="mailto:michael.voss@hp.com">Michael Voss</a> * */ public static class ClientAuthSocketFactory extends SSLServerSocketFactory{ Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ssl/serversocketrefresh/TestServer.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ssl/serversocketrefresh/TestServer.java 2009-07-07 23:47:10 UTC (rev 5302) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/ssl/serversocketrefresh/TestServer.java 2009-07-08 00:05:49 UTC (rev 5303) @@ -285,7 +285,7 @@ /** * overrides createServerSocket methods from class SSLServerSocketFactory * sets NeedClientAuth true, so server asks for a client certificate in the SSL handshake - * @author <a href="mailto:michael.voss@hp.com">Michael Vo�</a> + * @author <a href="mailto:michael.voss@hp.com">Michael Voss</a> * */ public static class ClientAuthSocketFactory extends SSLServerSocketFactory{

14 years, 9 months

1
0
0 / 0

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

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

Author: david.lloyd(a)jboss.com Date: 2009-07-07 19:47:10 -0400 (Tue, 07 Jul 2009) New Revision: 5302 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/callback/CallbackStore.java Log: Fix invalid characters (javadoc) Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/callback/CallbackStore.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/callback/CallbackStore.java 2009-07-07 23:10:58 UTC (rev 5301) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/callback/CallbackStore.java 2009-07-07 23:47:10 UTC (rev 5302) @@ -76,7 +76,7 @@ public static final String FILE_PATH_KEY = "StoreFilePath"; /** - * Key for setting the file suffix to use for the callback objects written to disk. The default value is �ser�. + * Key for setting the file suffix to use for the callback objects written to disk. The default value is "ser". */ public static final String FILE_SUFFIX_KEY = "StoreFileSuffix";

14 years, 9 months

1
0
0 / 0

JBoss Remoting SVN: r5301 - remoting2/branches.

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

Author: david.lloyd(a)jboss.com Date: 2009-07-07 19:10:58 -0400 (Tue, 07 Jul 2009) New Revision: 5301 Removed: remoting2/branches/2.2.3-hangfix/ Log: This didn't really fix anything :-)

14 years, 9 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 July 2009