Author: thomas.diesler(a)jboss.com Date: 2007-10-29 06:14:37 -0400 (Mon, 29 Oct 2007) New Revision: 4909 Modified: framework/branches/jbossws-framework-2.0.2/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java Log: Fix NPE in context properties handling Modified: framework/branches/jbossws-framework-2.0.2/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java =================================================================== --- framework/branches/jbossws-framework-2.0.2/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java 2007-10-29 09:46:36 UTC (rev 4908) +++ framework/branches/jbossws-framework-2.0.2/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java 2007-10-29 10:14:37 UTC (rev 4909) @@ -52,12 +52,15 @@ @Override public void create(Deployment dep) { - Iterator<String> it = contextProperties.keySet().iterator(); - while (it.hasNext()) + if (contextProperties != null) { - String key = it.next(); - String value = contextProperties.get(key); - dep.setProperty(key, value); + Iterator<String> it = contextProperties.keySet().iterator(); + while (it.hasNext()) + { + String key = it.next(); + String value = contextProperties.get(key); + dep.setProperty(key, value); + } } } } \ No newline at end of file