From jboss-remoting-commits at lists.jboss.org Tue Nov 22 12:41:20 2011
Content-Type: multipart/mixed; boundary="===============3441884907181958709=="
MIME-Version: 1.0
From: jboss-remoting-commits at lists.jboss.org
To: jboss-remoting-commits at lists.jboss.org
Subject: [jboss-remoting-commits] JBoss Remoting SVN: r6408 -
 remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/marshal.
Date: Tue, 22 Nov 2011 12:41:20 -0500
Message-ID: <201111221741.pAMHfK3Z020790@svn01.web.mwc.hst.phx2.redhat.com>

--===============3441884907181958709==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: ron.sigal(a)jboss.com
Date: 2011-11-22 12:41:20 -0500 (Tue, 22 Nov 2011)
New Revision: 6408

Added:
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/=
marshal/ContentTypePrefixTestCase.java
Log:
JBREM-1301: New unit test.

Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/h=
ttp/marshal/ContentTypePrefixTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http=
/marshal/ContentTypePrefixTestCase.java	                        (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http=
/marshal/ContentTypePrefixTestCase.java	2011-11-22 17:41:20 UTC (rev 6408)
@@ -0,0 +1,165 @@
+/*
+* 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.marshal;
+
+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.InvokerCallbackHandler;
+import org.jboss.remoting.transport.Connector;
+import org.jboss.remoting.transport.PortUtil;
+
+
+/**
+ * Unit test for JBREM-1301
+ * =

+ * @author <a href=3D"ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version =

+ * @version $Rev$, $Date$
+ */
+public class ContentTypePrefixTestCase extends TestCase
+{
+   private static Logger log =3D Logger.getLogger(ContentTypePrefixTestCas=
e.class);
+   =

+   private static boolean firstTime =3D true;
+   =

+   protected String host;
+   protected int port;
+   protected String locatorURI;
+   protected InvokerLocator serverLocator;
+   protected Connector connector;
+   protected TestInvocationHandler invocationHandler;
+
+   =

+   public void setUp() throws Exception
+   {
+      if (firstTime)
+      {
+         firstTime =3D false;
+         Logger.getLogger("org.jboss.remoting").setLevel(Level.INFO);
+         Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
+         String pattern =3D "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
+         PatternLayout layout =3D new PatternLayout(pattern);
+         ConsoleAppender consoleAppender =3D new ConsoleAppender(layout);
+         Logger.getRootLogger().addAppender(consoleAppender);  =

+      }
+   }
+
+   =

+   public void tearDown()
+   {
+   }
+   =

+   =

+   public void testContentType() throws Throwable
+   {
+      log.info("entering " + getName());
+      =

+      // Start server.
+      setupServer();
+      =

+      // Create client.
+      InvokerLocator clientLocator =3D new InvokerLocator(locatorURI);
+      HashMap clientConfig =3D new HashMap();
+      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+      addExtraClientConfig(clientConfig);
+      Client client =3D new Client(clientLocator, clientConfig);
+      client.connect();
+      log.info("client is connected");
+      =

+      // Test connection.
+      assertEquals("abc", client.invoke("abc"));
+      log.info("connection is good");
+      =

+      client.disconnect();
+      shutdownServer();
+      log.info(getName() + " PASSES");
+   }
+   =

+   =

+   protected String getTransport()
+   {
+      return "http";
+   }
+   =

+   =

+   protected void addExtraClientConfig(Map config) {}
+   protected void addExtraServerConfig(Map config) {}
+   =

+
+   protected void setupServer() throws Exception
+   {
+      host =3D InetAddress.getLocalHost().getHostAddress();
+      port =3D PortUtil.findFreePort(host);
+      locatorURI =3D getTransport() + "://" + host + ":" + port;
+      String metadata =3D System.getProperty("remoting.metadata");
+      if (metadata !=3D null)
+      {
+         locatorURI +=3D "/?" + metadata;
+      }
+      serverLocator =3D new InvokerLocator(locatorURI);
+      log.info("Starting remoting server with locator uri of: " + locatorU=
RI);
+      HashMap config =3D new HashMap();
+      config.put(InvokerLocator.FORCE_REMOTE, "true");
+      addExtraServerConfig(config);
+      connector =3D new Connector(serverLocator, config);
+      connector.create();
+      invocationHandler =3D new TestInvocationHandler();
+      connector.addInvocationHandler("test", invocationHandler);
+      connector.start();
+   }
+   =

+   =

+   protected void shutdownServer() throws Exception
+   {
+      if (connector !=3D null)
+         connector.stop();
+   }
+   =

+   =

+   static class TestInvocationHandler implements ServerInvocationHandler
+   {
+      public void addListener(InvokerCallbackHandler callbackHandler) {}
+      public Object invoke(final InvocationRequest invocation) throws Thro=
wable
+      {
+         invocation.getReturnPayload().put("Content-Type", "application/oc=
tet-stream?charSet=3DUTF-8");
+         return invocation.getParameter();
+      }
+      public void removeListener(InvokerCallbackHandler callbackHandler) {}
+      public void setMBeanServer(MBeanServer server) {}
+      public void setInvoker(ServerInvoker invoker) {}
+   }
+}
\ No newline at end of file


--===============3441884907181958709==--

From jboss-remoting-commits at lists.jboss.org Tue Nov 22 12:42:22 2011
Content-Type: multipart/mixed; boundary="===============0027806861737211302=="
MIME-Version: 1.0
From: jboss-remoting-commits at lists.jboss.org
To: jboss-remoting-commits at lists.jboss.org
Subject: [jboss-remoting-commits] JBoss Remoting SVN: r6409 -
 remoting2/branches/2.x/src/main/org/jboss/remoting/transport/web.
Date: Tue, 22 Nov 2011 12:42:22 -0500
Message-ID: <201111221742.pAMHgMH5020814@svn01.web.mwc.hst.phx2.redhat.com>

--===============0027806861737211302==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: ron.sigal(a)jboss.com
Date: 2011-11-22 12:42:22 -0500 (Tue, 22 Nov 2011)
New Revision: 6409

Modified:
   remoting2/branches/2.x/src/main/org/jboss/remoting/transport/web/WebUtil=
.java
Log:
JBREM-1301: Tests for prefix of content-type instead of equality.

Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/web/=
WebUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/web/WebUti=
l.java	2011-11-22 17:41:20 UTC (rev 6408)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/web/WebUti=
l.java	2011-11-22 17:42:22 UTC (rev 6409)
@@ -36,7 +36,7 @@
 =

    public static boolean isBinary(String requestContentType)
    {
-      if(BINARY.equalsIgnoreCase(requestContentType))
+      if (requestContentType !=3D null && requestContentType.startsWith(BI=
NARY))
       {
          return true;
       }


--===============0027806861737211302==--

From jboss-remoting-commits at lists.jboss.org Tue Nov 22 12:54:21 2011
Content-Type: multipart/mixed; boundary="===============8783837436539401991=="
MIME-Version: 1.0
From: jboss-remoting-commits at lists.jboss.org
To: jboss-remoting-commits at lists.jboss.org
Subject: [jboss-remoting-commits] JBoss Remoting SVN: r6410 -
 remoting2/branches/2.2/src/main/org/jboss/remoting/transport/web.
Date: Tue, 22 Nov 2011 12:54:21 -0500
Message-ID: <201111221754.pAMHsL2P021978@svn01.web.mwc.hst.phx2.redhat.com>

--===============8783837436539401991==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: ron.sigal(a)jboss.com
Date: 2011-11-22 12:54:20 -0500 (Tue, 22 Nov 2011)
New Revision: 6410

Modified:
   remoting2/branches/2.2/src/main/org/jboss/remoting/transport/web/WebUtil=
.java
Log:
JBREM-1301: Tests for prefix of content-type instead of equality.

Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/web/=
WebUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/web/WebUti=
l.java	2011-11-22 17:42:22 UTC (rev 6409)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/web/WebUti=
l.java	2011-11-22 17:54:20 UTC (rev 6410)
@@ -36,7 +36,7 @@
 =

    public static boolean isBinary(String requestContentType)
    {
-      if(BINARY.equalsIgnoreCase(requestContentType))
+      if (requestContentType !=3D null && requestContentType.toLowerCase()=
.startsWith(BINARY))
       {
          return true;
       }


--===============8783837436539401991==--

From jboss-remoting-commits at lists.jboss.org Tue Nov 22 12:54:54 2011
Content-Type: multipart/mixed; boundary="===============6775648147257723374=="
MIME-Version: 1.0
From: jboss-remoting-commits at lists.jboss.org
To: jboss-remoting-commits at lists.jboss.org
Subject: [jboss-remoting-commits] JBoss Remoting SVN: r6411 -
 remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/marshal.
Date: Tue, 22 Nov 2011 12:54:53 -0500
Message-ID: <201111221754.pAMHsrRw021990@svn01.web.mwc.hst.phx2.redhat.com>

--===============6775648147257723374==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: ron.sigal(a)jboss.com
Date: 2011-11-22 12:54:53 -0500 (Tue, 22 Nov 2011)
New Revision: 6411

Added:
   remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http/=
marshal/ContentTypePrefixTestCase.java
Log:
JBREM-1301: New unit test.

Added: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/h=
ttp/marshal/ContentTypePrefixTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http=
/marshal/ContentTypePrefixTestCase.java	                        (rev 0)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/http=
/marshal/ContentTypePrefixTestCase.java	2011-11-22 17:54:53 UTC (rev 6411)
@@ -0,0 +1,166 @@
+/*
+* 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.marshal;
+
+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.InvokerCallbackHandler;
+import org.jboss.remoting.transport.Connector;
+import org.jboss.remoting.transport.PortUtil;
+
+
+/**
+ * Unit test for JBREM-1301
+ * =

+ * @author <a href=3D"ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version =

+ * @version $Rev$, $Date$
+ */
+public class ContentTypePrefixTestCase extends TestCase
+{
+   private static Logger log =3D Logger.getLogger(ContentTypePrefixTestCas=
e.class);
+   =

+   private static boolean firstTime =3D true;
+   =

+   protected String host;
+   protected int port;
+   protected String locatorURI;
+   protected InvokerLocator serverLocator;
+   protected Connector connector;
+   protected TestInvocationHandler invocationHandler;
+
+   =

+   public void setUp() throws Exception
+   {
+      if (firstTime)
+      {
+         firstTime =3D false;
+         Logger.getLogger("org.jboss.remoting").setLevel(Level.INFO);
+         Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
+         String pattern =3D "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
+         PatternLayout layout =3D new PatternLayout(pattern);
+         ConsoleAppender consoleAppender =3D new ConsoleAppender(layout);
+         Logger.getRootLogger().addAppender(consoleAppender);  =

+      }
+   }
+
+   =

+   public void tearDown()
+   {
+   }
+   =

+   =

+   public void testContentType() throws Throwable
+   {
+      log.info("entering " + getName());
+      =

+      // Start server.
+      setupServer();
+      =

+      // Create client.
+      InvokerLocator clientLocator =3D new InvokerLocator(locatorURI);
+      HashMap clientConfig =3D new HashMap();
+      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+      addExtraClientConfig(clientConfig);
+      Client client =3D new Client(clientLocator, clientConfig);
+      client.connect();
+      log.info("client is connected");
+      =

+      // Test connection.
+      assertEquals("abc", client.invoke("abc"));
+      log.info("connection is good");
+      =

+      client.disconnect();
+      shutdownServer();
+      log.info(getName() + " PASSES");
+   }
+   =

+   =

+   protected String getTransport()
+   {
+      return "http";
+   }
+   =

+   =

+   protected void addExtraClientConfig(Map config) {}
+   protected void addExtraServerConfig(Map config) {}
+   =

+
+   protected void setupServer() throws Exception
+   {
+      host =3D InetAddress.getLocalHost().getHostAddress();
+      port =3D PortUtil.findFreePort(host);
+      locatorURI =3D getTransport() + "://" + host + ":" + port;
+      String metadata =3D System.getProperty("remoting.metadata");
+      if (metadata !=3D null)
+      {
+         locatorURI +=3D "/?" + metadata;
+      }
+      serverLocator =3D new InvokerLocator(locatorURI);
+      log.info("Starting remoting server with locator uri of: " + locatorU=
RI);
+      HashMap config =3D new HashMap();
+      config.put(InvokerLocator.FORCE_REMOTE, "true");
+      addExtraServerConfig(config);
+      connector =3D new Connector(serverLocator, config);
+      connector.create();
+      invocationHandler =3D new TestInvocationHandler();
+      connector.addInvocationHandler("test", invocationHandler);
+      connector.start();
+   }
+   =

+   =

+   protected void shutdownServer() throws Exception
+   {
+      if (connector !=3D null)
+         connector.stop();
+   }
+   =

+   =

+   static class TestInvocationHandler implements ServerInvocationHandler
+   {
+      public void addListener(InvokerCallbackHandler callbackHandler) {}
+      public Object invoke(final InvocationRequest invocation) throws Thro=
wable
+      {
+         // Adding some upper case characters for test.
+         invocation.getReturnPayload().put("Content-Type", "Application/Oc=
tet-stream?charSet=3DUTF-8");
+         return invocation.getParameter();
+      }
+      public void removeListener(InvokerCallbackHandler callbackHandler) {}
+      public void setMBeanServer(MBeanServer server) {}
+      public void setInvoker(ServerInvoker invoker) {}
+   }
+}
\ No newline at end of file


--===============6775648147257723374==--

From jboss-remoting-commits at lists.jboss.org Tue Nov 22 12:55:59 2011
Content-Type: multipart/mixed; boundary="===============6677737115239805361=="
MIME-Version: 1.0
From: jboss-remoting-commits at lists.jboss.org
To: jboss-remoting-commits at lists.jboss.org
Subject: [jboss-remoting-commits] JBoss Remoting SVN: r6412 -
 remoting2/branches/2.x/src/main/org/jboss/remoting/transport/web.
Date: Tue, 22 Nov 2011 12:55:59 -0500
Message-ID: <201111221755.pAMHtx1w022336@svn01.web.mwc.hst.phx2.redhat.com>

--===============6677737115239805361==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: ron.sigal(a)jboss.com
Date: 2011-11-22 12:55:58 -0500 (Tue, 22 Nov 2011)
New Revision: 6412

Modified:
   remoting2/branches/2.x/src/main/org/jboss/remoting/transport/web/WebUtil=
.java
Log:
JBREM-1301: Convert content-type to lower case before comparison.

Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/web/=
WebUtil.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/web/WebUti=
l.java	2011-11-22 17:54:53 UTC (rev 6411)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/web/WebUti=
l.java	2011-11-22 17:55:58 UTC (rev 6412)
@@ -36,7 +36,7 @@
 =

    public static boolean isBinary(String requestContentType)
    {
-      if (requestContentType !=3D null && requestContentType.startsWith(BI=
NARY))
+      if (requestContentType !=3D null && requestContentType.toLowerCase()=
.startsWith(BINARY))
       {
          return true;
       }


--===============6677737115239805361==--

From jboss-remoting-commits at lists.jboss.org Tue Nov 22 12:56:47 2011
Content-Type: multipart/mixed; boundary="===============4669492353658977721=="
MIME-Version: 1.0
From: jboss-remoting-commits at lists.jboss.org
To: jboss-remoting-commits at lists.jboss.org
Subject: [jboss-remoting-commits] JBoss Remoting SVN: r6413 -
 remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/marshal.
Date: Tue, 22 Nov 2011 12:56:47 -0500
Message-ID: <201111221756.pAMHuluk022347@svn01.web.mwc.hst.phx2.redhat.com>

--===============4669492353658977721==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: ron.sigal(a)jboss.com
Date: 2011-11-22 12:56:47 -0500 (Tue, 22 Nov 2011)
New Revision: 6413

Modified:
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http/=
marshal/ContentTypePrefixTestCase.java
Log:
JBREM-1301: Added some upper case characters to content-type.

Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transpor=
t/http/marshal/ContentTypePrefixTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http=
/marshal/ContentTypePrefixTestCase.java	2011-11-22 17:55:58 UTC (rev 6412)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/http=
/marshal/ContentTypePrefixTestCase.java	2011-11-22 17:56:47 UTC (rev 6413)
@@ -155,7 +155,8 @@
       public void addListener(InvokerCallbackHandler callbackHandler) {}
       public Object invoke(final InvocationRequest invocation) throws Thro=
wable
       {
-         invocation.getReturnPayload().put("Content-Type", "application/oc=
tet-stream?charSet=3DUTF-8");
+         // Adding some upper case characters for test.
+         invocation.getReturnPayload().put("Content-Type", "Application/Oc=
tet-stream?charSet=3DUTF-8");
          return invocation.getParameter();
       }
       public void removeListener(InvokerCallbackHandler callbackHandler) {}


--===============4669492353658977721==--

From jboss-remoting-commits at lists.jboss.org Mon Nov 28 13:31:00 2011
Content-Type: multipart/mixed; boundary="===============0754720435136924314=="
MIME-Version: 1.0
From: jboss-remoting-commits at lists.jboss.org
To: jboss-remoting-commits at lists.jboss.org
Subject: [jboss-remoting-commits] JBoss Remoting SVN: r6414 -
 remoting2/branches.
Date: Mon, 28 Nov 2011 13:31:00 -0500
Message-ID: <201111281831.pASIV0n8009281@svn01.web.mwc.hst.phx2.redhat.com>

--===============0754720435136924314==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jbertram(a)redhat.com
Date: 2011-11-28 13:30:59 -0500 (Mon, 28 Nov 2011)
New Revision: 6414

Added:
   remoting2/branches/2.2.3-SP3_JBREM-1297/
Log:
JBPAPP-7605


--===============0754720435136924314==--

From jboss-remoting-commits at lists.jboss.org Mon Nov 28 13:36:11 2011
Content-Type: multipart/mixed; boundary="===============2835408394627447117=="
MIME-Version: 1.0
From: jboss-remoting-commits at lists.jboss.org
To: jboss-remoting-commits at lists.jboss.org
Subject: [jboss-remoting-commits] JBoss Remoting SVN: r6415 -
 remoting2/branches.
Date: Mon, 28 Nov 2011 13:36:10 -0500
Message-ID: <201111281836.pASIaALQ009687@svn01.web.mwc.hst.phx2.redhat.com>

--===============2835408394627447117==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jbertram(a)redhat.com
Date: 2011-11-28 13:36:10 -0500 (Mon, 28 Nov 2011)
New Revision: 6415

Removed:
   remoting2/branches/2.2.3-SP3_JBREM-1297/
Log:
JBPAPP-7605


--===============2835408394627447117==--

From jboss-remoting-commits at lists.jboss.org Mon Nov 28 13:36:34 2011
Content-Type: multipart/mixed; boundary="===============8241002283932458721=="
MIME-Version: 1.0
From: jboss-remoting-commits at lists.jboss.org
To: jboss-remoting-commits at lists.jboss.org
Subject: [jboss-remoting-commits] JBoss Remoting SVN: r6416 -
 remoting2/branches.
Date: Mon, 28 Nov 2011 13:36:34 -0500
Message-ID: <201111281836.pASIaYpY009698@svn01.web.mwc.hst.phx2.redhat.com>

--===============8241002283932458721==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jbertram(a)redhat.com
Date: 2011-11-28 13:36:33 -0500 (Mon, 28 Nov 2011)
New Revision: 6416

Added:
   remoting2/branches/2.2.4_JBREM-1297/
Log:
JBPAPP-7605


--===============8241002283932458721==--

From jboss-remoting-commits at lists.jboss.org Wed Nov 30 13:59:07 2011
Content-Type: multipart/mixed; boundary="===============3313318420002345798=="
MIME-Version: 1.0
From: jboss-remoting-commits at lists.jboss.org
To: jboss-remoting-commits at lists.jboss.org
Subject: [jboss-remoting-commits] JBoss Remoting SVN: r6417 -
 remoting2/branches/2.2/src/etc.
Date: Wed, 30 Nov 2011 13:59:06 -0500
Message-ID: <201111301859.pAUIx6de016018@svn01.web.mwc.hst.phx2.redhat.com>

--===============3313318420002345798==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: ron.sigal(a)jboss.com
Date: 2011-11-30 13:59:06 -0500 (Wed, 30 Nov 2011)
New Revision: 6417

Added:
   remoting2/branches/2.2/src/etc/jenkins.touch
Log:
JBREM-1297: Adding new file to be used for starting a jenkins run.

Added: remoting2/branches/2.2/src/etc/jenkins.touch
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D

--===============3313318420002345798==--

From jboss-remoting-commits at lists.jboss.org Wed Nov 30 13:59:39 2011
Content-Type: multipart/mixed; boundary="===============9086845062176214991=="
MIME-Version: 1.0
From: jboss-remoting-commits at lists.jboss.org
To: jboss-remoting-commits at lists.jboss.org
Subject: [jboss-remoting-commits] JBoss Remoting SVN: r6418 -
 remoting2/branches/2.x/src/etc.
Date: Wed, 30 Nov 2011 13:59:39 -0500
Message-ID: <201111301859.pAUIxdua016033@svn01.web.mwc.hst.phx2.redhat.com>

--===============9086845062176214991==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: ron.sigal(a)jboss.com
Date: 2011-11-30 13:59:39 -0500 (Wed, 30 Nov 2011)
New Revision: 6418

Added:
   remoting2/branches/2.x/src/etc/jenkins.touch
Log:
JBREM-1297: Adding new file to be used for starting a jenkins run.

Added: remoting2/branches/2.x/src/etc/jenkins.touch
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D

--===============9086845062176214991==--

From jboss-remoting-commits at lists.jboss.org Wed Nov 30 15:06:10 2011
Content-Type: multipart/mixed; boundary="===============2715460318157122787=="
MIME-Version: 1.0
From: jboss-remoting-commits at lists.jboss.org
To: jboss-remoting-commits at lists.jboss.org
Subject: [jboss-remoting-commits] JBoss Remoting SVN: r6419 -
 remoting2/branches.
Date: Wed, 30 Nov 2011 15:06:10 -0500
Message-ID: <201111302006.pAUK6Akh001989@svn01.web.mwc.hst.phx2.redhat.com>

--===============2715460318157122787==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: raggz
Date: 2011-11-30 15:06:10 -0500 (Wed, 30 Nov 2011)
New Revision: 6419

Added:
   remoting2/branches/2.5.4.SP2_JBREM-1297/
Log:
Back port of JBREM-1297; JBPAPP-7631. =




--===============2715460318157122787==--

From jboss-remoting-commits at lists.jboss.org Wed Nov 30 15:52:19 2011
Content-Type: multipart/mixed; boundary="===============8865553896910763160=="
MIME-Version: 1.0
From: jboss-remoting-commits at lists.jboss.org
To: jboss-remoting-commits at lists.jboss.org
Subject: [jboss-remoting-commits] JBoss Remoting SVN: r6420 - in
 remoting2/branches/2.5.4.SP2_JBREM-1297: src/main/org/jboss/remoting and 9
 other directories.
Date: Wed, 30 Nov 2011 15:52:18 -0500
Message-ID: <201111302052.pAUKqIZ5006077@svn01.web.mwc.hst.phx2.redhat.com>

--===============8865553896910763160==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: raggz
Date: 2011-11-30 15:52:18 -0500 (Wed, 30 Nov 2011)
New Revision: 6420

Modified:
   remoting2/branches/2.5.4.SP2_JBREM-1297/
   remoting2/branches/2.5.4.SP2_JBREM-1297/src/main/org/jboss/remoting/Clie=
nt.java
   remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remotin=
g/transport/http/marshal/HttpContentTypeTestCase.java
   remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remotin=
g/transport/servlet/mbeanserver/jboss/MBeanServerJBossTestClient.java
   remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remotin=
g/transport/servlet/mbeanserver/platform/MBeanServerPlatformTestClient.java
   remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remotin=
g/transport/servlet/multihome/remoting-servlet-service.xml
   remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remotin=
g/transport/servlet/nopreservelines/remoting-servlet-service.xml
   remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remotin=
g/transport/servlet/preservelines/remoting-servlet-service.xml
   remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remotin=
g/transport/servlet/remoting-servlet-service.xml
   remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remotin=
g/transport/servlet/ssl/keystore
   remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remotin=
g/transport/servlet/ssl/remoting-servlet-service.xml
   remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remotin=
g/transport/servlet/ssl/truststore
   remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/jboss/test/remotin=
g/transport/socket/ssl/timeout/SSLSocketWriteTimeoutTestCase.java
Log:
JBPAPP-7631; Back port of JBREM-1297 - part1



Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297
___________________________________________________________________
Added: svn:mergeinfo
   + /remoting2/branches/2.x:6401

Modified: remoting2/branches/2.5.4.SP2_JBREM-1297/src/main/org/jboss/remoti=
ng/Client.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- remoting2/branches/2.5.4.SP2_JBREM-1297/src/main/org/jboss/remoting/Cli=
ent.java	2011-11-30 20:06:10 UTC (rev 6419)
+++ remoting2/branches/2.5.4.SP2_JBREM-1297/src/main/org/jboss/remoting/Cli=
ent.java	2011-11-30 20:52:18 UTC (rev 6420)
@@ -1904,6 +1904,12 @@
       }
    }
    =

+
+   static Object getConnectionValidatorLock()
+   {
+      return connectionValidatorLock;
+   }
+   =

    // Protected ----------------------------------------------------------=
--------------------------
 =

    // Private ------------------------------------------------------------=
--------------------------
@@ -2040,17 +2046,25 @@
          //
          // 1. a. This method calls MicroRemoteClientInvoker.establishLeas=
e()
          //    b. MicroRemoteClientInvoker.establishLease() synchronizes o=
n MicroRemoteClientInvoker.clientLeaseLock
-         //       and calls Client.addConnectionListener()
-         //    c. Client.addConnectionListener() synchronizes on Client.co=
nnectionValidatorLock
+         //    c. MicroRemoteClientInvoker.establishLease() calls Client.a=
ddConnectionListener()
+         //    d. Client.addConnectionListener() synchronizes on Client.co=
nnectionValidatorLock
          //
-         // 2. a. Client.addConnectionListener() synchronizes on Client.co=
nnectionValidatorLock and calls
-         //       new ConnectionValidator()
-         //    b. new ConnectionValidator() calls MicroRemoteClientInvoker=
.getLeasePinger(), which
-         //       synchronizes on MicroRemoteClientInvoker.clientLeaseLock
+         // 2. a. Client.addConnectionListener() synchronizes on Client.co=
nnectionValidatorLock
+         //    b. Client.addConnectionListener() calls new ConnectionValid=
ator()
+         //    c. new ConnectionValidator() calls MicroRemoteClientInvoker=
.getLeasePinger()
+         //    d. MicroRemoteClientInvoker.getLeasePinger() synchronizes o=
n MicroRemoteClientInvoker.clientLeaseLock
          //
-         // By synchronizing on connectionValidatorLock here, we assure th=
at both sequences acquire
+         // 3. a. ConnectionValidator$WaitOnConnectionCheckTimerTask.run()=
 synchronizes on Client.connectionValidatorLock
+         //    b. ConnectionValidator$WaitOnConnectionCheckTimerTask.run()=
 calls MicroRemoteClientInvoker.terminateLease()
+         //    c. MicroRemoteClientInvoker.terminateLease() synchronizes o=
n MicroRemoteClientInvoker.clientLeaseLock =

+         //    d. MicroRemoteClientInvoker.terminateLease() calls LeasePin=
ger.stopPing()
+         //    e. LeasePinger.stopPing() calls Client.notifyListeners()
+         //    f. Client.notifyListeners() synchronizes on Client.connecti=
onValidatorLock
+         //
+         // By synchronizing on connectionValidatorLock here, we assure th=
at all sequences acquire
          // Client.connectionValidatorLock first and then acquire MicroRem=
oteClientInvoker.clientLeaseLock.
          //
+         // See JBREM-1242 and JBREM-1297.
          synchronized(connectionValidatorLock)
          {
             invoker.establishLease(sessionId, temp, leasePeriod);


Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/=
jboss/test/remoting/transport/http/marshal/HttpContentTypeTestCase.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - =



Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/=
jboss/test/remoting/transport/servlet/mbeanserver/jboss/MBeanServerJBossTes=
tClient.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - =



Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/=
jboss/test/remoting/transport/servlet/mbeanserver/platform/MBeanServerPlatf=
ormTestClient.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - =



Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/=
jboss/test/remoting/transport/servlet/multihome/remoting-servlet-service.xml
___________________________________________________________________
Deleted: svn:mergeinfo
   - =



Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/=
jboss/test/remoting/transport/servlet/nopreservelines/remoting-servlet-serv=
ice.xml
___________________________________________________________________
Deleted: svn:mergeinfo
   - =



Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/=
jboss/test/remoting/transport/servlet/preservelines/remoting-servlet-servic=
e.xml
___________________________________________________________________
Deleted: svn:mergeinfo
   - =



Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/=
jboss/test/remoting/transport/servlet/remoting-servlet-service.xml
___________________________________________________________________
Deleted: svn:mergeinfo
   - =



Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/=
jboss/test/remoting/transport/servlet/ssl/keystore
___________________________________________________________________
Deleted: svn:mergeinfo
   - =



Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/=
jboss/test/remoting/transport/servlet/ssl/remoting-servlet-service.xml
___________________________________________________________________
Deleted: svn:mergeinfo
   - =



Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/=
jboss/test/remoting/transport/servlet/ssl/truststore
___________________________________________________________________
Deleted: svn:mergeinfo
   - =



Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297/src/tests/org/=
jboss/test/remoting/transport/socket/ssl/timeout/SSLSocketWriteTimeoutTestC=
ase.java
___________________________________________________________________
Deleted: svn:mergeinfo
   - =



--===============8865553896910763160==--

From jboss-remoting-commits at lists.jboss.org Wed Nov 30 15:54:33 2011
Content-Type: multipart/mixed; boundary="===============8791123294359549608=="
MIME-Version: 1.0
From: jboss-remoting-commits at lists.jboss.org
To: jboss-remoting-commits at lists.jboss.org
Subject: [jboss-remoting-commits] JBoss Remoting SVN: r6421 - in
 remoting2/branches/2.5.4.SP2_JBREM-1297: src/main/org/jboss/remoting and 1
 other directory.
Date: Wed, 30 Nov 2011 15:54:32 -0500
Message-ID: <201111302054.pAUKsWDl006384@svn01.web.mwc.hst.phx2.redhat.com>

--===============8791123294359549608==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: raggz
Date: 2011-11-30 15:54:32 -0500 (Wed, 30 Nov 2011)
New Revision: 6421

Modified:
   remoting2/branches/2.5.4.SP2_JBREM-1297/
   remoting2/branches/2.5.4.SP2_JBREM-1297/src/main/org/jboss/remoting/Conn=
ectionValidator.java
Log:
JBPAPP-7631; Back port JBREM-1297 - part2.



Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297
___________________________________________________________________
Modified: svn:mergeinfo
   - /remoting2/branches/2.x:6401
   + /remoting2/branches/2.x:6401-6402

Modified: remoting2/branches/2.5.4.SP2_JBREM-1297/src/main/org/jboss/remoti=
ng/ConnectionValidator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- remoting2/branches/2.5.4.SP2_JBREM-1297/src/main/org/jboss/remoting/Con=
nectionValidator.java	2011-11-30 20:52:18 UTC (rev 6420)
+++ remoting2/branches/2.5.4.SP2_JBREM-1297/src/main/org/jboss/remoting/Con=
nectionValidator.java	2011-11-30 20:54:32 UTC (rev 6421)
@@ -1078,7 +1078,36 @@
                   log.debug(ConnectionValidator.this + " shutting down lea=
se pinger: " + leasePinger);
                   int disconnectTimeout =3D (failureDisconnectTimeout =3D=
=3D -1) ? client.getDisconnectTimeout() : failureDisconnectTimeout;
                   if (trace) log.trace(ConnectionValidator.this + " discon=
nectTimeout: " + disconnectTimeout);
-                  sharedInvoker.terminateLease(null, disconnectTimeout, le=
asePinger);
+                  =

+                  =

+                  // Synchronizing on Client.connectionValidatorLock to pr=
event a deadlock:
+                  //
+                  // 1. a. This method calls MicroRemoteClientInvoker.term=
inateLease()
+                  //    b. MicroRemoteClientInvoker.terminateLease() synch=
ronizes on MicroRemoteClientInvoker.clientLeaseLock =

+                  //    c. MicroRemoteClientInvoker.terminateLease() calls=
 LeasePinger.stopPing()
+                  //    d. LeasePinger.stopPing() calls Client.notifyListe=
ners()
+                  //    e. Client.notifyListeners() synchronizes on Client=
.connectionValidatorLock
+                  //
+                  // 2. a. Client.connect() calls Client.setupClientLease()
+                  //    b. Client.setupClientLease() synchronizes on Clien=
t.connectionValidatorLock
+                  //    c. Client.setupClientLease() calls MicroRemoteClie=
ntInvoker.establishLease()
+                  //    d. MicroRemoteClientInvoker.establishLease() synch=
ronizes on MicroRemoteClientInvoker.clientLeaseLock
+                  //    e. MicroRemoteClientInvoker.establishLease() calls=
 Client.addConnectionListener()
+                  //    f. Client.addConnectionListener() synchronizes on =
Client.connectionValidatorLock
+                  //
+                  // 3. a. Client.addConnectionListener() synchronizes on =
Client.connectionValidatorLock
+                  //    b. Client.addConnectionListener() calls new Connec=
tionValidator()
+                  //    c. new ConnectionValidator() calls MicroRemoteClie=
ntInvoker.getLeasePinger()
+                  //    d. MicroRemoteClientInvoker.getLeasePinger() synch=
ronizes on MicroRemoteClientInvoker.clientLeaseLock
+                  //
+                  // By synchronizing on connectionValidatorLock here, we =
assure that all sequences acquire
+                  // Client.connectionValidatorLock first and then acquire=
 MicroRemoteClientInvoker.clientLeaseLock.
+                  //
+                  // See JBREM-1242 and JBREM-1297.
+                  synchronized (Client.getConnectionValidatorLock())
+                  {
+                     sharedInvoker.terminateLease(null, disconnectTimeout,=
 leasePinger);
+                  }
                }
                else
                {


--===============8791123294359549608==--

From jboss-remoting-commits at lists.jboss.org Wed Nov 30 16:00:58 2011
Content-Type: multipart/mixed; boundary="===============8083317597281540684=="
MIME-Version: 1.0
From: jboss-remoting-commits at lists.jboss.org
To: jboss-remoting-commits at lists.jboss.org
Subject: [jboss-remoting-commits] JBoss Remoting SVN: r6422 - in
 remoting2/branches/2.5.4.SP2_JBREM-1297: src/main/org/jboss/remoting and 1
 other directory.
Date: Wed, 30 Nov 2011 16:00:58 -0500
Message-ID: <201111302100.pAUL0wSC013119@svn01.web.mwc.hst.phx2.redhat.com>

--===============8083317597281540684==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: raggz
Date: 2011-11-30 16:00:58 -0500 (Wed, 30 Nov 2011)
New Revision: 6422

Modified:
   remoting2/branches/2.5.4.SP2_JBREM-1297/
   remoting2/branches/2.5.4.SP2_JBREM-1297/src/main/org/jboss/remoting/Conn=
ectionValidator.java
Log:
JBPAPP-7631; Back port JBREM-1297 - part3.


Property changes on: remoting2/branches/2.5.4.SP2_JBREM-1297
___________________________________________________________________
Modified: svn:mergeinfo
   - /remoting2/branches/2.x:6401-6402
   + /remoting2/branches/2.x:6401-6402,6405

Modified: remoting2/branches/2.5.4.SP2_JBREM-1297/src/main/org/jboss/remoti=
ng/ConnectionValidator.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- remoting2/branches/2.5.4.SP2_JBREM-1297/src/main/org/jboss/remoting/Con=
nectionValidator.java	2011-11-30 20:54:32 UTC (rev 6421)
+++ remoting2/branches/2.5.4.SP2_JBREM-1297/src/main/org/jboss/remoting/Con=
nectionValidator.java	2011-11-30 21:00:58 UTC (rev 6422)
@@ -1077,9 +1077,8 @@
                {
                   log.debug(ConnectionValidator.this + " shutting down lea=
se pinger: " + leasePinger);
                   int disconnectTimeout =3D (failureDisconnectTimeout =3D=
=3D -1) ? client.getDisconnectTimeout() : failureDisconnectTimeout;
-                  if (trace) log.trace(ConnectionValidator.this + " discon=
nectTimeout: " + disconnectTimeout);
+                  if (trace) log.trace(ConnectionValidator.this + " discon=
nectTimeout: " + disconnectTimeout); =

                   =

-                  =

                   // Synchronizing on Client.connectionValidatorLock to pr=
event a deadlock:
                   //
                   // 1. a. This method calls MicroRemoteClientInvoker.term=
inateLease()


--===============8083317597281540684==--