[jboss-svn-commits] JBL Code SVN: r26933 - labs/jbossrules/trunk/drools-core/src/main/java/org/drools.

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

Author: KrisVerlaenen
Date: 2009-06-11 22:10:32 -0400 (Thu, 11 Jun 2009)
New Revision: 26933

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java
Log:
 - fixed an issue where a comment in a work item definition file results in a null work item definition object, filtering out null now

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java	2009-06-12 00:35:55 UTC (rev 26932)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java	2009-06-12 02:10:32 UTC (rev 26933)
@@ -812,31 +812,33 @@
             List<Map<String, Object>> workDefinitionsMap = (List<Map<String, Object>>) MVEL.eval( content,
                                                                                                   new HashMap() );
             for ( Map<String, Object> workDefinitionMap : workDefinitionsMap ) {
-                WorkDefinitionExtensionImpl workDefinition = new WorkDefinitionExtensionImpl();
-                workDefinition.setName( (String) workDefinitionMap.get( "name" ) );
-                workDefinition.setDisplayName( (String) workDefinitionMap.get( "displayName" ) );
-                workDefinition.setIcon( (String) workDefinitionMap.get( "icon" ) );
-                workDefinition.setCustomEditor( (String) workDefinitionMap.get( "customEditor" ) );
-                Set<ParameterDefinition> parameters = new HashSet<ParameterDefinition>();
-                Map<String, DataType> parameterMap = (Map<String, DataType>) workDefinitionMap.get( "parameters" );
-                if ( parameterMap != null ) {
-                    for ( Map.Entry<String, DataType> entry : parameterMap.entrySet() ) {
-                        parameters.add( new ParameterDefinitionImpl( entry.getKey(),
-                                                                     entry.getValue() ) );
-                    }
-                }
-                workDefinition.setParameters( parameters );
-                Set<ParameterDefinition> results = new HashSet<ParameterDefinition>();
-                Map<String, DataType> resultMap = (Map<String, DataType>) workDefinitionMap.get( "results" );
-                if ( resultMap != null ) {
-                    for ( Map.Entry<String, DataType> entry : resultMap.entrySet() ) {
-                        results.add( new ParameterDefinitionImpl( entry.getKey(),
-                                                                  entry.getValue() ) );
-                    }
-                }
-                workDefinition.setResults( results );
-                this.workDefinitions.put( workDefinition.getName(),
-                                          workDefinition );
+            	if (workDefinitionMap != null) {
+	                WorkDefinitionExtensionImpl workDefinition = new WorkDefinitionExtensionImpl();
+	                workDefinition.setName( (String) workDefinitionMap.get( "name" ) );
+	                workDefinition.setDisplayName( (String) workDefinitionMap.get( "displayName" ) );
+	                workDefinition.setIcon( (String) workDefinitionMap.get( "icon" ) );
+	                workDefinition.setCustomEditor( (String) workDefinitionMap.get( "customEditor" ) );
+	                Set<ParameterDefinition> parameters = new HashSet<ParameterDefinition>();
+	                Map<String, DataType> parameterMap = (Map<String, DataType>) workDefinitionMap.get( "parameters" );
+	                if ( parameterMap != null ) {
+	                    for ( Map.Entry<String, DataType> entry : parameterMap.entrySet() ) {
+	                        parameters.add( new ParameterDefinitionImpl( entry.getKey(),
+	                                                                     entry.getValue() ) );
+	                    }
+	                }
+	                workDefinition.setParameters( parameters );
+	                Set<ParameterDefinition> results = new HashSet<ParameterDefinition>();
+	                Map<String, DataType> resultMap = (Map<String, DataType>) workDefinitionMap.get( "results" );
+	                if ( resultMap != null ) {
+	                    for ( Map.Entry<String, DataType> entry : resultMap.entrySet() ) {
+	                        results.add( new ParameterDefinitionImpl( entry.getKey(),
+	                                                                  entry.getValue() ) );
+	                    }
+	                }
+	                workDefinition.setResults( results );
+	                this.workDefinitions.put( workDefinition.getName(),
+	                                          workDefinition );
+            	}
             }
         } catch ( Throwable t ) {
             System.err.println( "Error occured while loading work definitions " + location );