Author: rhauch
Date: 2008-08-06 01:49:04 -0400 (Wed, 06 Aug 2008)
New Revision: 387
Modified:
trunk/connectors/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheSource.java
trunk/connectors/dna-connector-jbosscache/src/test/java/org/jboss/dna/connector/jbosscache/JBossCacheSourceTest.java
Log:
DNA-83 - Federate content from JBoss Cache instance(s)
http://jira.jboss.com/jira/browse/DNA-83
Added more unit tests.
Modified:
trunk/connectors/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheSource.java
===================================================================
---
trunk/connectors/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheSource.java 2008-08-06
05:44:32 UTC (rev 386)
+++
trunk/connectors/dna-connector-jbosscache/src/main/java/org/jboss/dna/connector/jbosscache/JBossCacheSource.java 2008-08-06
05:49:04 UTC (rev 387)
@@ -224,7 +224,7 @@
try {
lock.lock();
// Determine if this name is allowed ...
- if (sources.containsKey(name)) return false;
+ if (name != null && sources.containsKey(name)) return false;
// Remove this object under its current name
if (this.name != null) {
@@ -232,7 +232,9 @@
}
// Register this object under the new name
this.name = name;
- sources.put(this.name, this);
+ if (this.name != null) {
+ sources.put(this.name, this);
+ }
return true;
} finally {
lock.unlock();
Modified:
trunk/connectors/dna-connector-jbosscache/src/test/java/org/jboss/dna/connector/jbosscache/JBossCacheSourceTest.java
===================================================================
---
trunk/connectors/dna-connector-jbosscache/src/test/java/org/jboss/dna/connector/jbosscache/JBossCacheSourceTest.java 2008-08-06
05:44:32 UTC (rev 386)
+++
trunk/connectors/dna-connector-jbosscache/src/test/java/org/jboss/dna/connector/jbosscache/JBossCacheSourceTest.java 2008-08-06
05:49:04 UTC (rev 387)
@@ -63,17 +63,16 @@
@Test
public void shouldAllowSettingName() {
- source.setName("Something");
+ assertThat(source.setName("Something"), is(true));
assertThat(source.getName(), is("Something"));
- source.setName("another name");
+ assertThat(source.setName("another name"), is(true));
assertThat(source.getName(), is("another name"));
}
@Test
- public void shouldAllowSettingNameToNull() {
- source.setName("some name");
- source.setName(null);
+ public void shouldNotAllowSettingNameToNull() {
+ assertThat(source.setName("some name"), is(true));
+ assertThat(source.setName(null), is(true));
assertThat(source.getName(), is(nullValue()));
}
-
}