[jboss-remoting-commits] JBoss Remoting SVN: r5242 - remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket.

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

Author: ron.sigal at jboss.com
Date: 2009-05-16 00:11:23 -0400 (Sat, 16 May 2009)
New Revision: 5242

Modified:
   remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/ServerThread.java
Log:
JBREM-1102: Moved retrieval of value of "passConfigMapToMarshalFactory".

Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/ServerThread.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/ServerThread.java	2009-05-16 04:08:12 UTC (rev 5241)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/ServerThread.java	2009-05-16 04:11:23 UTC (rev 5242)
@@ -162,11 +162,6 @@
          {
             shouldCheckConnection = true;
          }
-         checkValue = (String)configMap.get(Remoting.PASS_CONFIG_MAP_TO_MARSHAL_FACTORY);
-         if (checkValue != null && checkValue.length() > 0)
-         {
-            passConfigMapToMarshalFactory = Boolean.valueOf(checkValue).booleanValue();
-         }
       }
    }
 
@@ -819,7 +814,19 @@
       {
          configMap = invoker.getConfiguration();
       }
-      
+      boolean passConfigMapToMarshalFactory = false;
+      if (configMap != null)
+      {
+         Object o = configMap.get(Remoting.PASS_CONFIG_MAP_TO_MARSHAL_FACTORY);
+         if (o instanceof String)
+         {
+            passConfigMapToMarshalFactory = Boolean.valueOf((String) o).booleanValue();
+         }
+         else if (o != null)
+         {
+            log.warn("Value of " + Remoting.PASS_CONFIG_MAP_TO_MARSHAL_FACTORY + " should be of type String: " + o);
+         }
+      }
       Map map = passConfigMapToMarshalFactory ? configMap : null;
       if (unmarshaller == null)
       {