[jbossws-commits] JBossWS SVN: r3752 - branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/rpc/handler.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-06-28 00:52:09 -0400 (Thu, 28 Jun 2007)
New Revision: 3752

Modified:
   branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/rpc/handler/HandlerInfo.java
Log:
Prevent NPE with null handler confog

Modified: branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/rpc/handler/HandlerInfo.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/rpc/handler/HandlerInfo.java	2007-06-27 21:18:36 UTC (rev 3751)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/rpc/handler/HandlerInfo.java	2007-06-28 04:52:09 UTC (rev 3752)
@@ -59,8 +59,9 @@
    public HandlerInfo(Class handlerClass, Map config, QName[] headers)
    {
       this.handlerClass = handlerClass;
-      this.configMap.putAll(config);
       this.headers = headers;
+      if (config != null)
+         this.configMap.putAll(config);
    }
 
    /** Gets the Handler class
@@ -97,7 +98,8 @@
    public void setHandlerConfig(Map config)
    {
       configMap.clear();
-      configMap.putAll(config);
+      if (config != null)
+         configMap.putAll(config);
    }
 
    /** Gets the header blocks processed by this Handler.