Author: andy
Date: Tue Jan 29 18:28:34 2013
New Revision: 1440048
URL: http://svn.apache.org/viewvc?rev=1440048&view=rev
Log:
Fix putAll
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapBase.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/AbstractTestPrefixMap.java
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapBase.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapBase.java?rev=1440048&r1=1440047&r2=1440048&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapBase.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapBase.java
Tue Jan 29 18:28:34 2013
@@ -73,7 +73,7 @@ public abstract class PrefixMapBase impl
@Override
public void putAll(PrefixMap pmap) {
- for (Map.Entry<String, IRI> e : this.getMapping().entrySet()) {
+ for (Map.Entry<String, IRI> e : pmap.getMapping().entrySet()) {
this.add(e.getKey(), e.getValue());
}
}
Modified:
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/AbstractTestPrefixMap.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/AbstractTestPrefixMap.java?rev=1440048&r1=1440047&r2=1440048&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/AbstractTestPrefixMap.java
(original)
+++
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/AbstractTestPrefixMap.java
Tue Jan 29 18:28:34 2013
@@ -67,6 +67,21 @@ public abstract class AbstractTestPrefix
assertTrue(pmap.contains("")) ;
assertTrue(pmap.contains("org")) ;
}
+
+ @Test
+ public void prefixMap_basic_04()
+ {
+ PrefixMap pmap1 = getPrefixMap();
+ pmap1.add("", "http://example/";) ;
+ pmap1.add("org", "http://example.org/";) ;
+ PrefixMap pmap2 = getPrefixMap();
+ pmap2.putAll(pmap1) ;
+
+ assertTrue(pmap2.contains("")) ;
+ assertTrue(pmap2.contains("org")) ;
+ }
+
+
/**
* Simple expand test
