[jboss-cvs] jboss-seam/src/main/org/jboss/seam/drools ...

[Gavin King]

  User: gavin   
  Date: 06/10/08 15:12:35

  Modified:    src/main/org/jboss/seam/drools   ManagedWorkingMemory.java
                        RuleBase.java
  Log:
  better error reporting
  
  Revision  Changes    Path
  1.4       +15 -4     jboss-seam/src/main/org/jboss/seam/drools/ManagedWorkingMemory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ManagedWorkingMemory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/drools/ManagedWorkingMemory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- ManagedWorkingMemory.java	2 Jul 2006 16:56:59 -0000	1.3
  +++ ManagedWorkingMemory.java	8 Oct 2006 19:12:35 -0000	1.4
  @@ -55,12 +55,23 @@
      {
         if (workingMemory==null)
         {
  -         RuleBase ruleBase = this.ruleBase==null ? 
  -               (RuleBase) Component.getInstance(ruleBaseName, true) :
  -                this.ruleBase;
  +         RuleBase ruleBase;
  +         if (this.ruleBase!=null)
  +         {
  +            ruleBase = this.ruleBase;
  +         }
  +         else if (ruleBaseName!=null)
  +         {
  +            ruleBase = (RuleBase) Component.getInstance(ruleBaseName, true);
  +         }
  +         else
  +         {
  +            throw new IllegalStateException("No RuleBase");
  +         }
  +                
            if (ruleBase==null)
            {
  -            throw new IllegalArgumentException("RuleBase not found: " + ruleBaseName);
  +            throw new IllegalStateException("RuleBase not found: " + ruleBaseName);
            }
            workingMemory = ruleBase.newWorkingMemory();
         }
  
  
  
  1.4       +16 -13    jboss-seam/src/main/org/jboss/seam/drools/RuleBase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RuleBase.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/drools/RuleBase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- RuleBase.java	24 Jul 2006 16:15:55 -0000	1.3
  +++ RuleBase.java	8 Oct 2006 19:12:35 -0000	1.4
  @@ -32,6 +32,8 @@
         conf.setCompiler(PackageBuilderConfiguration.JANINO);
         PackageBuilder builder = new PackageBuilder(conf);
         
  +      if (ruleFiles!=null)
  +      {
         for (String ruleFile: ruleFiles)
         {
            // read in the source
  @@ -49,6 +51,7 @@
            // pre build the package
            builder.addPackage(packageDescr);
         }
  +      }
         
         // add the package to a rulebase
         ruleBase = RuleBaseFactory.newRuleBase();