[jboss-remoting-commits] JBoss Remoting SVN: r5379 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/bisocket.

[jboss-remoting-commits at lists.jboss.org]

Author: ron.sigal at jboss.com
Date: 2009-08-19 21:43:47 -0400 (Wed, 19 Aug 2009)
New Revision: 5379

Modified:
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/bisocket/BisocketControlConnectionReplacementTestCase.java
Log:
JBREM-1147: Allow more initial writes for jdk 1.4.

Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/bisocket/BisocketControlConnectionReplacementTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/bisocket/BisocketControlConnectionReplacementTestCase.java	2009-08-20 01:42:56 UTC (rev 5378)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/bisocket/BisocketControlConnectionReplacementTestCase.java	2009-08-20 01:43:47 UTC (rev 5379)
@@ -41,6 +41,7 @@
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PatternLayout;
+import org.jboss.logging.XLevel;
 import org.jboss.remoting.Client;
 import org.jboss.remoting.InvocationRequest;
 import org.jboss.remoting.InvokerLocator;
@@ -68,6 +69,7 @@
 {
    private static Logger log = Logger.getLogger(BisocketControlConnectionReplacementTestCase.class);
    
+   protected static int INITIAL_WRITES;
    protected static boolean firstTime = true;
    protected static int secondaryServerSocketPort;
    protected static int numberOfCallbacks = 10;
@@ -87,12 +89,23 @@
       if (firstTime)
       {
          firstTime = false;
-         Logger.getLogger("org.jboss.remoting").setLevel(Level.DEBUG);
+         Logger.getLogger("org.jboss.remoting").setLevel(XLevel.TRACE);
          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);  
+         Logger.getRootLogger().addAppender(consoleAppender);
+         
+         String jdkVersion = System.getProperty("java.version");
+         log.info("jdk version: " + jdkVersion);
+         if (jdkVersion != null && jdkVersion.indexOf("1.4") >= 0)
+         {
+            INITIAL_WRITES = 5;
+         }
+         else
+         {
+            INITIAL_WRITES = 2;
+         }
       }
    }
 
@@ -274,7 +287,7 @@
       public TestServerSocketFactory()
       {
          this.timeout = 5000;
-         this.initialWrites = 2;
+         this.initialWrites = INITIAL_WRITES;
       }      
       public TestServerSocketFactory(int timeout, int initialWrites)
       {
@@ -457,6 +470,12 @@
       }
       public void write(byte b[], int off, int len) throws IOException
       {
+         for (int i = 0; i < len; i++)
+         {
+            System.out.print(b[i] + " ");
+         }
+         System.out.println("");
+         
          if (closed)
          {
             log.info("TestOutputStream closed, cannot write");