December 2010 - jboss-remoting-commits

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

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

Author: ron.sigal(a)jboss.com Date: 2010-12-28 13:41:16 -0500 (Tue, 28 Dec 2010) New Revision: 6200 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java Log: JBREM-1263: checkConnection() verifies the returned byte is the same one that was sent. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java 2010-12-28 18:39:39 UTC (rev 6199) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java 2010-12-28 18:41:16 UTC (rev 6200) @@ -102,6 +102,12 @@ out.write(ACK); out.flush(); int i = in.read(); + + if (i != ACK) + { + throw new IOException("got " + i + " instead of " + ACK); + } + if (trace) { log.trace(this + " got " + i + " while checking connection"); } }

13 years, 11 months

1
0
0 / 0

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

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

Author: ron.sigal(a)jboss.com Date: 2010-12-28 13:39:39 -0500 (Tue, 28 Dec 2010) New Revision: 6199 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java Log: JBREM-1263: checkConnection() verifies the returned byte is the same one that was sent. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java 2010-12-27 18:43:19 UTC (rev 6198) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java 2010-12-28 18:39:39 UTC (rev 6199) @@ -102,6 +102,12 @@ out.write(ACK); out.flush(); int i = in.read(); + + if (i != ACK) + { + throw new IOException("got " + i + " instead of " + ACK); + } + if (trace) { log.trace(this + " got " + i + " while checking connection"); } }

13 years, 11 months

1
0
0 / 0

JBoss Remoting SVN: r6198 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/identity.

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

Author: ron.sigal(a)jboss.com Date: 2010-12-27 13:43:19 -0500 (Mon, 27 Dec 2010) New Revision: 6198 Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/identity/ServerIdentityTestCase.java Log: JBREM-1144: Added "socket.check_connection=true to InvokerLocator. Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/identity/ServerIdentityTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/identity/ServerIdentityTestCase.java 2010-12-27 18:42:02 UTC (rev 6197) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/identity/ServerIdentityTestCase.java 2010-12-27 18:43:19 UTC (rev 6198) @@ -248,6 +248,7 @@ protected void setupServer(boolean useLeasing) throws Exception { locatorURI = getTransport() + "://" + host + ":" + port + "?" + Remoting.USE_SERVER_CONNECTION_IDENTITY + "=true"; + locatorURI += "&" + SocketServerInvoker.CHECK_CONNECTION_KEY + "=true"; if (useLeasing) { locatorURI += "&" + InvokerLocator.CLIENT_LEASE + "=true";

13 years, 11 months

1
0
0 / 0

JBoss Remoting SVN: r6197 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/identity.

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

Author: ron.sigal(a)jboss.com Date: 2010-12-27 13:42:02 -0500 (Mon, 27 Dec 2010) New Revision: 6197 Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/identity/ServerIdentityTestCase.java Log: JBREM-1144: Added "socket.check_connection=true to InvokerLocator. Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/identity/ServerIdentityTestCase.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/identity/ServerIdentityTestCase.java 2010-12-25 05:08:35 UTC (rev 6196) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/identity/ServerIdentityTestCase.java 2010-12-27 18:42:02 UTC (rev 6197) @@ -292,6 +292,7 @@ protected void setupServer(boolean useLeasing) throws Exception { locatorURI = getTransport() + "://" + host + ":" + port + "?" + Remoting.USE_SERVER_CONNECTION_IDENTITY + "=true"; + locatorURI += "&" + SocketServerInvoker.CHECK_CONNECTION_KEY + "=true"; if (useLeasing) { locatorURI += "&" + InvokerLocator.CLIENT_LEASE + "=true";

13 years, 11 months

1
0
0 / 0

JBoss Remoting SVN: r6196 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http.

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

Author: ron.sigal(a)jboss.com Date: 2010-12-25 00:08:35 -0500 (Sat, 25 Dec 2010) New Revision: 6196 Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/IgnoreResponseMessageTestCase.java Log: JBREM-1248: New unit tests. Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/IgnoreResponseMessageTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/IgnoreResponseMessageTestCase.java (rev 0) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/IgnoreResponseMessageTestCase.java 2010-12-25 05:08:35 UTC (rev 6196) @@ -0,0 +1,294 @@ +/* +* 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.transport.http; + +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.net.InetAddress; +import java.security.AccessController; +import java.security.PrivilegedActionException; +import java.security.PrivilegedExceptionAction; +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.Client; +import org.jboss.remoting.InvokerLocator; +import org.jboss.remoting.transport.PortUtil; +import org.jboss.remoting.transport.http.HTTPClientInvoker; +import org.jboss.test.remoting.classloader.RemoteClassloaderTestCase; + + +/** + * JBREM-1248. + * + * @author <a href="mailto:ron.sigal@jboss.com">Ron Sigal</a> + * @version $Rev$ + * <p> + * Copyright Dec 24, 2010 + * </p> + */ +public class IgnoreResponseMessageTestCase extends TestCase +{ + private static Logger log = Logger.getLogger(IgnoreResponseMessageTestCase.class); + + protected String host; + protected int port; + protected String locatorURI; + protected ByteArrayOutputStream baos; + protected PrintStream originalPrintStream; + + + public void setUp() throws Exception + { + originalPrintStream = System.out; + baos = new ByteArrayOutputStream(); + PrintStream ps = new PrintStream(baos); + System.setOut(ps); + + Logger.getLogger("org.jboss.remoting").setLevel(Level.DEBUG); + 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); + log = Logger.getLogger(RemoteClassloaderTestCase.class); + } + + + public void tearDown() + { + } + + + public void testDefault() throws Throwable + { + log.info("entering " + getName()); + + // Create client. + setupLocator(); + log.info(this + " locator: " + locatorURI); + 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"); + + // Attempt invocation. + try + { + client.invoke("abc"); + fail("expected exception"); + } + catch (Exception e) + { + log.info(this + " got exception: " + e.getMessage()); + } + + System.setOut(originalPrintStream); + String s = new String(baos.toByteArray()); + System.out.println(s); + assertTrue(s.indexOf("Unable to retrieve response message") > -1); + + client.disconnect(); + log.info(getName() + " PASSES"); + } + + + public void testIgnoreErrorResponseMessageLocatorFalse() throws Throwable + { + log.info("entering " + getName()); + + // Create client. + setupLocator(); + locatorURI += "&ignoreErrorResponseMessage=false"; + log.info(this + " locator: " + locatorURI); + 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"); + + // Attempt invocation. + try + { + client.invoke("abc"); + fail("expected exception"); + } + catch (Exception e) + { + log.info(this + " got exception: " + e.getMessage()); + } + + System.setOut(originalPrintStream); + String s = new String(baos.toByteArray()); + System.out.println(s); + assertTrue(s.indexOf("Unable to retrieve response message") > -1); + + client.disconnect(); + log.info(getName() + " PASSES"); + } + + + public void testIgnoreErrorResponseMessageLocatorTrue() throws Throwable + { + log.info("entering " + getName()); + + // Create client. + setupLocator(); + locatorURI += "&" + HTTPClientInvoker.IGNORE_ERROR_RESPONSE_MESSAGE + "=true"; + log.info(this + " locator: " + locatorURI); + 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"); + + // Attempt invocation. + try + { + client.invoke("abc"); + fail("expected exception"); + } + catch (Exception e) + { + log.info(this + " got exception: " + e.getMessage()); + } + + System.setOut(originalPrintStream); + String s = new String(baos.toByteArray()); + System.out.println(s); + assertTrue(s.indexOf("Unable to retrieve response message") == -1); + + client.disconnect(); + log.info(getName() + " PASSES"); + } + + + public void testIgnoreErrorResponseMessageConfigFalse() throws Throwable + { + log.info("entering " + getName()); + + // Create client. + setupLocator(); + log.info(this + " locator: " + locatorURI); + InvokerLocator clientLocator = new InvokerLocator(locatorURI); + HashMap clientConfig = new HashMap(); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + clientConfig.put(HTTPClientInvoker.IGNORE_ERROR_RESPONSE_MESSAGE, "false"); + addExtraClientConfig(clientConfig); + Client client = new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + + // Attempt invocation. + try + { + client.invoke("abc"); + fail("expected exception"); + } + catch (Exception e) + { + log.info(this + " got exception: " + e.getMessage()); + } + + System.setOut(originalPrintStream); + String s = new String(baos.toByteArray()); + System.out.println(s); + assertTrue(s.indexOf("Unable to retrieve response message") > -1); + + client.disconnect(); + log.info(getName() + " PASSES"); + } + + + public void testIgnoreErrorResponseMessageConfigTrue() throws Throwable + { + log.info("entering " + getName()); + + // Create client. + setupLocator(); + locatorURI += "&" + HTTPClientInvoker.IGNORE_ERROR_RESPONSE_MESSAGE + "=true"; + log.info(this + " locator: " + locatorURI); + InvokerLocator clientLocator = new InvokerLocator(locatorURI); + HashMap clientConfig = new HashMap(); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + clientConfig.put(HTTPClientInvoker.IGNORE_ERROR_RESPONSE_MESSAGE, "true"); + addExtraClientConfig(clientConfig); + Client client = new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + + // Attempt invocation. + try + { + client.invoke("abc"); + fail("expected exception"); + } + catch (Exception e) + { + log.info(this + " got exception: " + e.getMessage()); + } + + System.setOut(originalPrintStream); + String s = new String(baos.toByteArray()); + System.out.println(s); + assertTrue(s.indexOf("Unable to retrieve response message") == -1); + + client.disconnect(); + log.info(getName() + " PASSES"); + } + + + protected String getTransport() + { + return "http"; + } + + + protected void addExtraClientConfig(Map config) {} + protected void addExtraServerConfig(Map config) {} + + + protected void setupLocator() throws Exception + { + host = InetAddress.getLocalHost().getHostAddress(); + port = PortUtil.findFreePort(host); + locatorURI = getTransport() + "://" + host + ":" + port + "/?a=b"; + String metadata = System.getProperty("remoting.metadata"); + if (metadata != null) + { + locatorURI += "&" + metadata; + } + } +} \ No newline at end of file

13 years, 11 months

1
0
0 / 0

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

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

Author: ron.sigal(a)jboss.com Date: 2010-12-25 00:08:12 -0500 (Sat, 25 Dec 2010) New Revision: 6195 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java Log: JBREM-1248: Added ignoreErrorResponseMessage variable. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java 2010-12-25 00:12:09 UTC (rev 6194) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java 2010-12-25 05:08:12 UTC (rev 6195) @@ -99,10 +99,17 @@ */ public static final String UNMARSHAL_NULL_STREAM = "unmarshalNullStream"; + /** + * Specifies whether useHttpURLConnection() should try to get a response message and response + * code in the event of an exception. + */ + public static final String IGNORE_ERROR_RESPONSE_MESSAGE = "ignoreErrorResponseMessage"; + protected static final Logger log = Logger.getLogger(HTTPClientInvoker.class); protected boolean unmarshalNullStream = true; protected boolean useRemotingContentType = false; + protected boolean ignoreErrorResponseMessage = false; private Object timeoutThreadPoolLock = new Object(); private ThreadPool timeoutThreadPool; @@ -366,17 +373,20 @@ String message = "Can not connect http client invoker."; if (e.getMessage() != null) message += " " + e.getMessage() + "."; - - try + + if (!ignoreErrorResponseMessage) { - String responseMessage = conn.getResponseMessage(); - int code = conn.getResponseCode(); - message += " Response: " + responseMessage + "/" + code + "."; + try + { + String responseMessage = conn.getResponseMessage(); + int code = conn.getResponseCode(); + message += " Response: " + responseMessage + "/" + code + "."; + } + catch (IOException e1) + { + log.debug("Unable to retrieve response message", e1); + } } - catch (IOException e1) - { - log.debug("Unable to retrieve response message", e1); - } throw new CannotConnectException(message, e); } @@ -958,6 +968,22 @@ val + " to a boolean value."); } } + + val = configuration.get(IGNORE_ERROR_RESPONSE_MESSAGE); + if (val != null) + { + try + { + ignoreErrorResponseMessage = Boolean.valueOf((String)val).booleanValue(); + log.debug(this + " setting ignoreErrorResponseMessage to " + ignoreErrorResponseMessage); + } + catch (Exception e) + { + log.warn(this + " could not convert " + + IGNORE_ERROR_RESPONSE_MESSAGE + " value of " + + val + " to a boolean value."); + } + } } /**

13 years, 11 months

1
0
0 / 0

JBoss Remoting SVN: r6194 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http.

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

Author: ron.sigal(a)jboss.com Date: 2010-12-24 19:12:09 -0500 (Fri, 24 Dec 2010) New Revision: 6194 Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/IgnoreResponseMessageTestCase.java Log: JBREM-1248: New unit tests. Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/IgnoreResponseMessageTestCase.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/IgnoreResponseMessageTestCase.java (rev 0) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/IgnoreResponseMessageTestCase.java 2010-12-25 00:12:09 UTC (rev 6194) @@ -0,0 +1,321 @@ +/* +* 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.transport.http; + +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.net.InetAddress; +import java.security.AccessController; +import java.security.PrivilegedActionException; +import java.security.PrivilegedExceptionAction; +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.Client; +import org.jboss.remoting.InvokerLocator; +import org.jboss.remoting.transport.PortUtil; +import org.jboss.remoting.transport.http.HTTPClientInvoker; +import org.jboss.remoting.util.SecurityUtility; +import org.jboss.test.remoting.classloader.RemoteClassloaderTestCase; + + +/** + * JBREM-1248. + * + * @author <a href="mailto:ron.sigal@jboss.com">Ron Sigal</a> + * @version $Rev$ + * <p> + * Copyright Dec 24, 2010 + * </p> + */ +public class IgnoreResponseMessageTestCase extends TestCase +{ + private static Logger log = Logger.getLogger(IgnoreResponseMessageTestCase.class); + + protected String host; + protected int port; + protected String locatorURI; + protected ByteArrayOutputStream baos; + protected PrintStream originalPrintStream; + + + public void setUp() throws Exception + { + originalPrintStream = System.out; + baos = new ByteArrayOutputStream(); + PrintStream ps = new PrintStream(baos); + setOut(ps); + + Logger.getLogger("org.jboss.remoting").setLevel(Level.DEBUG); + 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); + log = Logger.getLogger(RemoteClassloaderTestCase.class); + } + + + public void tearDown() + { + } + + + public void testDefault() throws Throwable + { + log.info("entering " + getName()); + + // Create client. + setupLocator(); + log.info(this + " locator: " + locatorURI); + 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"); + + // Attempt invocation. + try + { + client.invoke("abc"); + fail("expected exception"); + } + catch (Exception e) + { + log.info(this + " got exception: " + e.getMessage()); + } + + setOut(originalPrintStream); + String s = new String(baos.toByteArray()); + System.out.println(s); + assertTrue(s.indexOf("Unable to retrieve response message") > -1); + + client.disconnect(); + log.info(getName() + " PASSES"); + } + + + public void testIgnoreErrorResponseMessageLocatorFalse() throws Throwable + { + log.info("entering " + getName()); + + // Create client. + setupLocator(); + locatorURI += "&ignoreErrorResponseMessage=false"; + log.info(this + " locator: " + locatorURI); + 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"); + + // Attempt invocation. + try + { + client.invoke("abc"); + fail("expected exception"); + } + catch (Exception e) + { + log.info(this + " got exception: " + e.getMessage()); + } + + setOut(originalPrintStream); + String s = new String(baos.toByteArray()); + System.out.println(s); + assertTrue(s.indexOf("Unable to retrieve response message") > -1); + + client.disconnect(); + log.info(getName() + " PASSES"); + } + + + public void testIgnoreErrorResponseMessageLocatorTrue() throws Throwable + { + log.info("entering " + getName()); + + // Create client. + setupLocator(); + locatorURI += "&" + HTTPClientInvoker.IGNORE_ERROR_RESPONSE_MESSAGE + "=true"; + log.info(this + " locator: " + locatorURI); + 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"); + + // Attempt invocation. + try + { + client.invoke("abc"); + fail("expected exception"); + } + catch (Exception e) + { + log.info(this + " got exception: " + e.getMessage()); + } + + setOut(originalPrintStream); + String s = new String(baos.toByteArray()); + System.out.println(s); + assertTrue(s.indexOf("Unable to retrieve response message") == -1); + + client.disconnect(); + log.info(getName() + " PASSES"); + } + + + public void testIgnoreErrorResponseMessageConfigFalse() throws Throwable + { + log.info("entering " + getName()); + + // Create client. + setupLocator(); + log.info(this + " locator: " + locatorURI); + InvokerLocator clientLocator = new InvokerLocator(locatorURI); + HashMap clientConfig = new HashMap(); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + clientConfig.put(HTTPClientInvoker.IGNORE_ERROR_RESPONSE_MESSAGE, "false"); + addExtraClientConfig(clientConfig); + Client client = new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + + // Attempt invocation. + try + { + client.invoke("abc"); + fail("expected exception"); + } + catch (Exception e) + { + log.info(this + " got exception: " + e.getMessage()); + } + + setOut(originalPrintStream); + String s = new String(baos.toByteArray()); + System.out.println(s); + assertTrue(s.indexOf("Unable to retrieve response message") > -1); + + client.disconnect(); + log.info(getName() + " PASSES"); + } + + + public void testIgnoreErrorResponseMessageConfigTrue() throws Throwable + { + log.info("entering " + getName()); + + // Create client. + setupLocator(); + locatorURI += "&" + HTTPClientInvoker.IGNORE_ERROR_RESPONSE_MESSAGE + "=true"; + log.info(this + " locator: " + locatorURI); + InvokerLocator clientLocator = new InvokerLocator(locatorURI); + HashMap clientConfig = new HashMap(); + clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + clientConfig.put(HTTPClientInvoker.IGNORE_ERROR_RESPONSE_MESSAGE, "true"); + addExtraClientConfig(clientConfig); + Client client = new Client(clientLocator, clientConfig); + client.connect(); + log.info("client is connected"); + + // Attempt invocation. + try + { + client.invoke("abc"); + fail("expected exception"); + } + catch (Exception e) + { + log.info(this + " got exception: " + e.getMessage()); + } + + setOut(originalPrintStream); + String s = new String(baos.toByteArray()); + System.out.println(s); + assertTrue(s.indexOf("Unable to retrieve response message") == -1); + + client.disconnect(); + log.info(getName() + " PASSES"); + } + + + protected String getTransport() + { + return "http"; + } + + + protected void addExtraClientConfig(Map config) {} + protected void addExtraServerConfig(Map config) {} + + + protected void setupLocator() throws Exception + { + host = InetAddress.getLocalHost().getHostAddress(); + port = PortUtil.findFreePort(host); + locatorURI = getTransport() + "://" + host + ":" + port + "/?a=b"; + String metadata = System.getProperty("remoting.metadata"); + if (metadata != null) + { + locatorURI += "&" + metadata; + } + } + + + static private void setOut(final PrintStream ps) + { + if (SecurityUtility.skipAccessControl()) + { + System.setOut(ps); + return; + } + + try + { + AccessController.doPrivileged( new PrivilegedExceptionAction() + { + public Object run() throws Exception + { + System.setOut(ps); + return null; + } + }); + } + catch (PrivilegedActionException e) + { + throw (RuntimeException) e.getCause(); + } + } +} \ No newline at end of file

13 years, 11 months

1
0
0 / 0

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

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

Author: ron.sigal(a)jboss.com Date: 2010-12-24 19:11:21 -0500 (Fri, 24 Dec 2010) New Revision: 6193 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java Log: JBREM-1248: Added ignoreErrorResponseMessage variable. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java 2010-12-24 19:26:38 UTC (rev 6192) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java 2010-12-25 00:11:21 UTC (rev 6193) @@ -110,12 +110,19 @@ */ public static final String UNMARSHAL_NULL_STREAM = "unmarshalNullStream"; + /** + * Specifies whether useHttpURLConnection() should try to get a response message and response + * code in the event of an exception. + */ + public static final String IGNORE_ERROR_RESPONSE_MESSAGE = "ignoreErrorResponseMessage"; + protected static final Logger log = Logger.getLogger(HTTPClientInvoker.class); protected boolean noThrowOnError; protected int numberOfCallAttempts = 1; protected boolean unmarshalNullStream = true; protected boolean useRemotingContentType = false; + protected boolean ignoreErrorResponseMessage = false; private Object timeoutThreadPoolLock = new Object(); private ThreadPool timeoutThreadPool; @@ -414,17 +421,20 @@ String message = "Can not connect http client invoker."; if (e.getMessage() != null) message += " " + e.getMessage() + "."; - - try + + if (!ignoreErrorResponseMessage) { - String responseMessage = getResponseMessage(conn); - int code = getResponseCode(conn); - message += " Response: " + responseMessage + "/" + code + "."; + try + { + String responseMessage = getResponseMessage(conn); + int code = getResponseCode(conn); + message += " Response: " + responseMessage + "/" + code + "."; + } + catch (IOException e1) + { + log.debug("Unable to retrieve response message", e1); + } } - catch (IOException e1) - { - log.debug("Unable to retrieve response message", e1); - } throw new CannotConnectException(message, e); } @@ -1074,6 +1084,22 @@ val + " to a boolean value."); } } + + val = configuration.get(IGNORE_ERROR_RESPONSE_MESSAGE); + if (val != null) + { + try + { + ignoreErrorResponseMessage = Boolean.valueOf((String)val).booleanValue(); + log.debug(this + " setting ignoreErrorResponseMessage to " + ignoreErrorResponseMessage); + } + catch (Exception e) + { + log.warn(this + " could not convert " + + IGNORE_ERROR_RESPONSE_MESSAGE + " value of " + + val + " to a boolean value."); + } + } } /**

13 years, 11 months

1
0
0 / 0

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

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

Author: ron.sigal(a)jboss.com Date: 2010-12-24 14:26:38 -0500 (Fri, 24 Dec 2010) New Revision: 6192 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java Log: JBREM-1247: PingTimerTask.shutDown() sets running to false. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java 2010-12-24 00:04:51 UTC (rev 6191) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java 2010-12-24 19:26:38 UTC (rev 6192) @@ -703,6 +703,7 @@ { synchronized (controlLock) { + running = false; controlOutputStream = null; } cancel();

13 years, 11 months

1
0
0 / 0

JBoss Remoting SVN: r6191 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/identity.

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

Author: ron.sigal(a)jboss.com Date: 2010-12-23 19:04:51 -0500 (Thu, 23 Dec 2010) New Revision: 6191 Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/identity/ServerIdentityTestCase.java Log: JBREM-1144: Added "numberOfCallRetries" to Client's config map for ConnectionValidator. Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/identity/ServerIdentityTestCase.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/identity/ServerIdentityTestCase.java 2010-12-24 00:02:43 UTC (rev 6190) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/identity/ServerIdentityTestCase.java 2010-12-24 00:04:51 UTC (rev 6191) @@ -126,6 +126,7 @@ InvokerLocator clientLocator = new InvokerLocator(locatorURI + "&dummy=dummy"); HashMap clientConfig = new HashMap(); clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + clientConfig.put("numberOfCallRetries", "3"); // for ConnectionValidator addExtraClientConfig(clientConfig); Client client = new Client(clientLocator, clientConfig); client.connect(); @@ -181,6 +182,7 @@ InvokerLocator clientLocator = new InvokerLocator(locatorURI + "&dummy=dummy"); HashMap clientConfig = new HashMap(); clientConfig.put(InvokerLocator.FORCE_REMOTE, "true"); + clientConfig.put("numberOfCallRetries", "3"); // for ConnectionValidator addExtraClientConfig(clientConfig); Client client = new Client(clientLocator, clientConfig); client.connect();

13 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 December 2010