Skip to Content.
Sympa Menu

notify-dpml - r1393 - trunk/main/metro/component/src/main/net/dpml/component

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r1393 - trunk/main/metro/component/src/main/net/dpml/component
  • Date: Sun, 23 Apr 2006 15:39:11 +0200

Author: mcconnell
Date: 2006-04-23 15:39:10 +0200 (Sun, 23 Apr 2006)
New Revision: 1393

Modified:
trunk/main/metro/component/src/main/net/dpml/component/Composition.java
Log:
housekeeping

Modified:
trunk/main/metro/component/src/main/net/dpml/component/Composition.java
===================================================================
--- trunk/main/metro/component/src/main/net/dpml/component/Composition.java
2006-04-22 20:03:59 UTC (rev 1392)
+++ trunk/main/metro/component/src/main/net/dpml/component/Composition.java
2006-04-23 13:39:10 UTC (rev 1393)
@@ -58,11 +58,6 @@
{
throw new NullPointerException( "directive" );
}
- if( null == controller )
- {
- throw new NullPointerException( "controller" );
- }
-
m_directive = directive;
m_controller = controller;
}
@@ -175,14 +170,22 @@
if( super.equals( other ) && ( other instanceof Composition ) )
{
Composition composite = (Composition) other;
- if( !m_directive.equals( composite.m_directive )
+ if( !m_directive.equals( composite.m_directive ) )
{
return false;
}
else
{
- return m_controller.equals( composite.m_controller )
+ if( null == m_controller )
+ {
+ return null == composite.m_controller;
+ }
+ else
+ {
+ return m_controller.equals( composite.m_controller );
+ }
}
+ }
else
{
return false;
@@ -197,7 +200,10 @@
{
int hash = super.hashCode();
hash ^= m_directive.hashCode();
- hash ^= m_controller.hashCode();
+ if( null != m_controller )
+ {
+ hash ^= m_controller.hashCode();
+ }
return hash;
}
}




  • r1393 - trunk/main/metro/component/src/main/net/dpml/component, mcconnell at BerliOS, 04/23/2006

Archive powered by MHonArc 2.6.24.

Top of Page