[dna-commits] DNA SVN: r1402 - in trunk: dna-graph/src/test/java/org/jboss/dna/graph/observe and 2 other directories.

Author: elvisisking Date: 2009-12-04 07:26:35 -0500 (Fri, 04 Dec 2009) New Revision: 1402 Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/observe/ObservationBus.java trunk/dna-graph/src/test/java/org/jboss/dna/graph/observe/MockObservable.java trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrRepository.java trunk/dna-repository/src/main/java/org/jboss/dna/repository/RepositoryLibrary.java Log: DNA 568 Observable.register(Observer) Contract Is Being Violated: Fixed the register method to return false if the observer being registered is null. Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/observe/ObservationBus.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/observe/ObservationBus.java 2009-12-04 07:38:49 UTC (rev 1401) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/observe/ObservationBus.java 2009-12-04 12:26:35 UTC (rev 1402) @@ -42,6 +42,7 @@ * @see org.jboss.dna.graph.observe.Observable#register(org.jboss.dna.graph.observe.Observer) */ public boolean register( Observer observer ) { + if (observer == null) return false; return observers.register(observer); } Modified: trunk/dna-graph/src/test/java/org/jboss/dna/graph/observe/MockObservable.java =================================================================== --- trunk/dna-graph/src/test/java/org/jboss/dna/graph/observe/MockObservable.java 2009-12-04 07:38:49 UTC (rev 1401) +++ trunk/dna-graph/src/test/java/org/jboss/dna/graph/observe/MockObservable.java 2009-12-04 12:26:35 UTC (rev 1402) @@ -34,7 +34,7 @@ * @see org.jboss.dna.graph.observe.Observable#register(org.jboss.dna.graph.observe.Observer) */ public boolean register( Observer observer ) { - return true; + return ((observer == null) ? false : true); } /** Modified: trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrRepository.java =================================================================== --- trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrRepository.java 2009-12-04 07:38:49 UTC (rev 1401) +++ trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrRepository.java 2009-12-04 12:26:35 UTC (rev 1402) @@ -989,7 +989,7 @@ * @see org.jboss.dna.graph.observe.Observable#register(org.jboss.dna.graph.observe.Observer) */ public boolean register( Observer observer ) { - CheckArg.isNotNull(observer, "observer"); + if (observer == null) return false; return this.observers.addIfAbsent(observer); } Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/RepositoryLibrary.java =================================================================== --- trunk/dna-repository/src/main/java/org/jboss/dna/repository/RepositoryLibrary.java 2009-12-04 07:38:49 UTC (rev 1401) +++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/RepositoryLibrary.java 2009-12-04 12:26:35 UTC (rev 1402) @@ -171,6 +171,7 @@ * @see org.jboss.dna.graph.observe.Observable#register(org.jboss.dna.graph.observe.Observer) */ public boolean register( Observer observer ) { + if (observer == null) return false; return observationBus.register(observer); }