From: Julio G. <ju...@us...> - 2006-07-28 01:46:47
|
Update of /cvsroot/smartfrog/core/smartfrog/src/org/smartfrog/sfcore/prim In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11642/smartfrog/src/org/smartfrog/sfcore/prim Modified Files: PrimImpl.java Log Message: Code cleaning. Index: PrimImpl.java =================================================================== RCS file: /cvsroot/smartfrog/core/smartfrog/src/org/smartfrog/sfcore/prim/PrimImpl.java,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** PrimImpl.java 19 Jul 2006 11:00:20 -0000 1.98 --- PrimImpl.java 25 Jul 2006 20:12:26 -0000 1.99 *************** *** 87,100 **** /** Static attribute that hold the lifecycle hooks for sfDeploy. */ ! public static PrimHookSet sfDeployHooks = new PrimHookSet(); /** Static attribute that hold the lifecycle hooks for sfStart. */ ! public static PrimHookSet sfStartHooks = new PrimHookSet(); /** Static attribute that hold the lifecycle hooks for sfDeployWith. */ ! public static PrimHookSet sfDeployWithHooks = new PrimHookSet(); /** Static attribute that hold the lifecycle hooks for sfTerminateWith. */ ! public static PrimHookSet sfTerminateWithHooks = new PrimHookSet(); /** Reference used to look up sfLivenessDelay attributes. */ --- 87,100 ---- /** Static attribute that hold the lifecycle hooks for sfDeploy. */ ! public static final PrimHookSet sfDeployHooks = new PrimHookSet(); /** Static attribute that hold the lifecycle hooks for sfStart. */ ! public static final PrimHookSet sfStartHooks = new PrimHookSet(); /** Static attribute that hold the lifecycle hooks for sfDeployWith. */ ! public static final PrimHookSet sfDeployWithHooks = new PrimHookSet(); /** Static attribute that hold the lifecycle hooks for sfTerminateWith. */ ! public static final PrimHookSet sfTerminateWithHooks = new PrimHookSet(); /** Reference used to look up sfLivenessDelay attributes. */ *************** *** 662,666 **** } //Logger.log(sfex); ! new TerminatorThread(this, sfex, null).quietly().run(); throw (SmartFrogDeploymentException)SmartFrogDeploymentException.forward(sfex); } --- 662,666 ---- } //Logger.log(sfex); ! new TerminatorThread(this, sfex, null).quietly().start(); throw (SmartFrogDeploymentException)SmartFrogDeploymentException.forward(sfex); } *************** *** 983,986 **** --- 983,987 ---- SFProcess.getProcessCompound().sfAttributeKeyFor(this))); } catch (Exception ex2) { + if (sfLog().isIgnoreEnabled()){ sfLog().ignore(ex2); } //ignore } *************** *** 993,999 **** // ignore //Logger.logQuietly(ex); ! if (sfLog().isIgnoreEnabled()){ ! sfLog().ignore(ex); ! } } --- 994,998 ---- // ignore //Logger.logQuietly(ex); ! if (sfLog().isIgnoreEnabled()){ sfLog().ignore(ex); } } *************** *** 1003,1009 **** } catch (Exception ex) { // Logger.logQuietly(ex); ! if (sfLog().isIgnoreEnabled()){ ! sfLog().ignore(ex); ! } } } --- 1002,1006 ---- } catch (Exception ex) { // Logger.logQuietly(ex); ! if (sfLog().isIgnoreEnabled()){ sfLog().ignore(ex); } } } *************** *** 1016,1022 **** // @TODO: Log. Ignore. //Logger.logQuietly(ex); ! if (sfLog().isIgnoreEnabled()){ ! sfLog().ignore(ex); ! } } --- 1013,1017 ---- // @TODO: Log. Ignore. //Logger.logQuietly(ex); ! if (sfLog().isIgnoreEnabled()){ sfLog().ignore(ex); } } *************** *** 1079,1085 **** } catch (Exception ex) { //Logger.logQuietly(ex); ! if (sfLog().isIgnoreEnabled()){ ! sfLog().ignore(ex); ! } } } --- 1074,1078 ---- } catch (Exception ex) { //Logger.logQuietly(ex); ! if (sfLog().isIgnoreEnabled()){ sfLog().ignore(ex); } } } *************** *** 1159,1163 **** source.equals(sfLivenessSender) && (sfLivenessCount-- <= 0)) { ! fail = true; } } --- 1152,1156 ---- source.equals(sfLivenessSender) && (sfLivenessCount-- <= 0)) { ! fail = true; } } *************** *** 1165,1169 **** if (fail) { if (sfLog().isDebugEnabled()) { ! sfLog().debug("failing as parent liveness checking had counted down: in " + sfCompleteNameSafe()); } sfLivenessFailure(this, sfParent, null); --- 1158,1162 ---- if (fail) { if (sfLog().isDebugEnabled()) { ! sfLog().debug("failing as parent liveness checking had counted down: in " + sfCompleteNameSafe()); } sfLivenessFailure(this, sfParent, null); |