[Smartfrog-checkins] core/smartfrog/src/org/smartfrog/sfcore/workflow/combinators Parallel.java,1.2,1.3 Sequence.java,1.3,1.4

[Julio G. <ju...@us...>]

Update of /cvsroot/smartfrog/core/smartfrog/src/org/smartfrog/sfcore/workflow/combinators
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17775/smartfrog/src/org/smartfrog/sfcore/workflow/combinators

Modified Files:
	Parallel.java Sequence.java 
Log Message:
Improved error messaging.

Index: Parallel.java
===================================================================
RCS file: /cvsroot/smartfrog/core/smartfrog/src/org/smartfrog/sfcore/workflow/combinators/Parallel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Parallel.java	11 May 2004 17:29:58 -0000	1.2
--- Parallel.java	10 Jun 2004 23:49:30 -0000	1.3
***************
*** 27,30 ****
--- 27,31 ----
  import org.smartfrog.sfcore.common.SmartFrogException;
  import org.smartfrog.sfcore.common.SmartFrogRuntimeException;
+ import org.smartfrog.sfcore.common.Logger;
  import org.smartfrog.sfcore.componentdescription.ComponentDescription;
  import org.smartfrog.sfcore.compound.Compound;
***************
*** 121,124 ****
--- 122,126 ----
              }
          } catch (Exception ex) {
+             Logger.log(this.sfCompleteNameSafe()+" - Failed to start sub-components ",ex);
              sfTerminate(TerminationRecord.abnormal(
                      "Failed to start sub-components " + ex, name));
***************
*** 149,152 ****
--- 151,155 ----
                  }
              } catch (Exception e) {
+                 Logger.log(this.sfCompleteNameSafe()+" - error handling child termination ",e );
                  sfTerminate(TerminationRecord.abnormal(
                          "error handling child termination " + e, name));

Index: Sequence.java
===================================================================
RCS file: /cvsroot/smartfrog/core/smartfrog/src/org/smartfrog/sfcore/workflow/combinators/Sequence.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Sequence.java	1 Jun 2004 15:40:35 -0000	1.3
--- Sequence.java	10 Jun 2004 23:49:30 -0000	1.4
***************
*** 33,36 ****
--- 33,37 ----
  import org.smartfrog.sfcore.reference.Reference;
  import org.smartfrog.sfcore.workflow.eventbus.EventCompoundImpl;
+ import org.smartfrog.sfcore.common.Logger;
  
  
***************
*** 132,139 ****
                      }
                  } else {
!                     //System.out.println("error in previous sequenced component, aborting " + name.toString() + " parent:" + sfParent().toString());
                      super.sfTerminatedWith(status, comp);
                  }
              } catch (Exception e) {
                  sfTerminate(TerminationRecord.abnormal(
                          "error in starting next component: exception " + e, name));
--- 133,141 ----
                      }
                  } else {
!                     Logger.log(name+ "- error in previous sequenced component, aborting. "  + " parent:" + sfParent().sfCompleteName(),status);
                      super.sfTerminatedWith(status, comp);
                  }
              } catch (Exception e) {
+                 Logger.log(name+" - error in starting next component ", e);
                  sfTerminate(TerminationRecord.abnormal(
                          "error in starting next component: exception " + e, name));