Author: cziegeler Date: Tue Jul 28 15:13:05 2009 New Revision: 798556 URL: http://svn.apache.org/viewvc?rev=798556&view=rev Log: Prepare for upcomming 4.2 release and avoid ambigious method call.
Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/AbstractRepositoryEventHandler.java sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/EventUtilTest.java Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/AbstractRepositoryEventHandler.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/AbstractRepositoryEventHandler.java?rev=798556&r1=798555&r2=798556&view=diff ============================================================================== --- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/AbstractRepositoryEventHandler.java (original) +++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/AbstractRepositoryEventHandler.java Tue Jul 28 15:13:05 2009 @@ -170,7 +170,7 @@ // stop background threads by putting empty objects into the queue this.running = false; try { - this.writeQueue.put(new Event("some", null)); + this.writeQueue.put(new Event("some", (Dictionary)null)); } catch (InterruptedException e) { this.ignoreException(e); } @@ -303,7 +303,7 @@ eventProps.put(JobStatusProvider.PROPERTY_EVENT_ID, eventNode.getPath()); this.addEventProperties(eventNode, eventProps); try { - final Event event = new Event(topic, eventProps); + final Event event = new Event(topic, (Dictionary)eventProps); return event; } catch (IllegalArgumentException iae) { // this exception occurs if the topic is not correct (it should never happen, Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/EventUtilTest.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/EventUtilTest.java?rev=798556&r1=798555&r2=798556&view=diff ============================================================================== --- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/EventUtilTest.java (original) +++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/EventUtilTest.java Tue Jul 28 15:13:05 2009 @@ -23,6 +23,7 @@ import static org.junit.Assert.assertTrue; import java.util.Calendar; +import java.util.Dictionary; import java.util.Properties; import javax.jcr.PropertyType; @@ -52,16 +53,16 @@ @Test public void testDistributeFlag() { final Event distributableEvent = EventUtil.createDistributableEvent("some/topic", null); assertTrue(EventUtil.shouldDistribute(distributableEvent)); - final Event nonDistributableEvent = new Event("another/topic", null); + final Event nonDistributableEvent = new Event("another/topic", (Dictionary)null); assertFalse(EventUtil.shouldDistribute(nonDistributableEvent)); } @Test public void testLocalFlag() { - final Event localEvent = new Event("local/event", null); + final Event localEvent = new Event("local/event", (Dictionary)null); assertTrue(EventUtil.isLocal(localEvent)); final Properties props = new Properties(); props.put(EventUtil.PROPERTY_APPLICATION, "application1"); - final Event remoteEvent = new Event("remote/event", props); + final Event remoteEvent = new Event("remote/event", (Dictionary)props); assertFalse(EventUtil.isLocal(remoteEvent)); }