Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24878/src/org/tm4j/topicmap/tmdm/tm4j1
Modified Files:
TopicMapProviderImpl.java
Log Message:
Reject two different topicmaps with the same baseLocator.
Index: TopicMapProviderImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/tm4j1/TopicMapProviderImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TopicMapProviderImpl.java 21 Jan 2008 11:13:45 -0000 1.1
--- TopicMapProviderImpl.java 23 Jan 2008 20:09:24 -0000 1.2
***************
*** 80,84 ****
}
! public org.tm4j.topicmap.TopicMap createTopicMap(Locator baseLocator) {
// Syslog.log(this,Syslog.DEBUG4,"createTopicMap("+baseLocator+").");
--- 80,84 ----
}
! public org.tm4j.topicmap.TopicMap createTopicMap(Locator baseLocator) throws TopicMapProviderException {
// Syslog.log(this,Syslog.DEBUG4,"createTopicMap("+baseLocator+").");
***************
*** 96,99 ****
--- 96,104 ----
TopicMapImpl oldTopicMap = storedTopicMaps.put(baseLocator,topicMap);
+ if (oldTopicMap!=null) {
+ storedTopicMaps.put(baseLocator,oldTopicMap);
+ throw new TopicMapProviderException("Base locator "+baseLocator+" already in use for a different topic map.");
+ }
+
storedTopicMaps = storedTopicMaps;
|
