Skip to Content.
Sympa Menu

notify-dpml - svn commit: r2437 - development/main/metro/composition/control/src/main/net/dpml/composition/control

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell AT dpml.net
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r2437 - development/main/metro/composition/control/src/main/net/dpml/composition/control
  • Date: Thu, 28 Apr 2005 12:25:30 -0400

Author: mcconnell AT dpml.net
Date: Thu Apr 28 12:25:27 2005
New Revision: 2437

Modified:

development/main/metro/composition/control/src/main/net/dpml/composition/control/ComponentController.java
Log:
fix an NPE in the state management model

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/ComponentController.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/ComponentController.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/ComponentController.java
Thu Apr 28 12:25:27 2005
@@ -462,23 +462,35 @@
*/
private boolean applyTransition( ComponentEntry entry, DefaultTransition
transition ) throws Exception
{
+ if( null == entry )
+ {
+ throw new NullPointerException( "entry" );
+ }
+ if( null == transition )
+ {
+ throw new NullPointerException( "transition" );
+ }
+
+ getInstance( entry );
DefaultState state = entry.getCurrentState();
URI handler = transition.getHandlerURI();
DefaultState target = transition.getTransitionTarget();

- if( getMonitor().isDebugEnabled() )
+ if( null != handler )
{
- final String message =
- "applying ["
- + handler.toString()
- + "] to state ["
- + state.getName()
- + "]";
- getMonitor().debug( message );
+ if( getMonitor().isDebugEnabled() )
+ {
+ final String message =
+ "applying ["
+ + handler
+ + "] to state ["
+ + state.getName()
+ + "]";
+ getMonitor().debug( message );
+ }
+ execution( entry, handler, state, target );
}

- execution( entry, handler, state, target );
-
if( state != target )
{
entry.setState( target );



  • svn commit: r2437 - development/main/metro/composition/control/src/main/net/dpml/composition/control, mcconnell, 04/28/2005

Archive powered by MHonArc 2.6.24.

Top of Page