Author: rwesten
Date: Thu Oct 29 11:42:07 2015
New Revision: 1711228
URL: http://svn.apache.org/viewvc?rev=1711228&view=rev
Log:
merged fix for STANBOL-1445 to trunk
Modified:
stanbol/trunk/ (props changed)
stanbol/trunk/enhancement-engines/ (props changed)
stanbol/trunk/enhancement-engines/dereference/entityhub/src/main/java/org/apache/stanbol/enhancer/engines/dereference/entityhub/TrackingDereferencerBase.java
Propchange: stanbol/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 29 11:42:07 2015
@@ -1 +1 @@
-/stanbol/branches/release-0.12:1571146,1571150,1572559,1572583,1572586,1572588,1572944,1573918,1573936,1574911,1577150,1581735,1581830,1587573,1587824,1587844,1587860,1588447,1588449,1589341,1590930,1593490,1593899,1594122,1594490,1595157-1595158,1596518,1597063,1597561,1597575,1597760,1598019,1599433,1599973,1604752,1608340,1608360,1609451,1617239,1624001,1626979,1633539,1635413,1638045,1674012,1675556,1689331,1691353,1697898,1700711,1700734,1701226,1707665,1709397,1710951
+/stanbol/branches/release-0.12:1571146,1571150,1572559,1572583,1572586,1572588,1572944,1573918,1573936,1574911,1577150,1581735,1581830,1587573,1587824,1587844,1587860,1588447,1588449,1589341,1590930,1593490,1593899,1594122,1594490,1595157-1595158,1596518,1597063,1597561,1597575,1597760,1598019,1599433,1599973,1604752,1608340,1608360,1609451,1617239,1624001,1626979,1633539,1635413,1638045,1674012,1675556,1689331,1691353,1697898,1700711,1700734,1701226,1707665,1709397,1710951,1711227
Propchange: stanbol/trunk/enhancement-engines/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 29 11:42:07 2015
@@ -1,7 +1,7 @@
/incubator/stanbol/branches/dbpedia-spotlight-engines/engines:1374978-1386535
/incubator/stanbol/branches/stanbol-nlp-processing/enhancer/engines:1386989-1388016
/stanbol/branches/STANBOL-913:1443935-1448276
-/stanbol/branches/release-0.12/enhancement-engines:1571150,1572559,1572586,1572588,1572944,1573918,1573936,1574911,1577150,1588447,1589341,1590930,1593490,1597063,1597575,1597760,1609451,1617239,1624001,1638045,1674012,1700734,1701226,1707665,1709397,1710951
+/stanbol/branches/release-0.12/enhancement-engines:1571150,1572559,1572586,1572588,1572944,1573918,1573936,1574911,1577150,1588447,1589341,1590930,1593490,1597063,1597575,1597760,1609451,1617239,1624001,1638045,1674012,1700734,1701226,1707665,1709397,1710951,1711227
/stanbol/branches/stanbol-nlp-processing/enhancer/engines:1388017-1413353
/stanbol/branches/stanbol-solr4/enhancement-engines:1455112-1458685
/stanbol/trunk/enhancement-engines:1496360-1533530
Modified:
stanbol/trunk/enhancement-engines/dereference/entityhub/src/main/java/org/apache/stanbol/enhancer/engines/dereference/entityhub/TrackingDereferencerBase.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/dereference/entityhub/src/main/java/org/apache/stanbol/enhancer/engines/dereference/entityhub/TrackingDereferencerBase.java?rev=1711228&r1=1711227&r2=1711228&view=diff
==============================================================================
---
stanbol/trunk/enhancement-engines/dereference/entityhub/src/main/java/org/apache/stanbol/enhancer/engines/dereference/entityhub/TrackingDereferencerBase.java
(original)
+++
stanbol/trunk/enhancement-engines/dereference/entityhub/src/main/java/org/apache/stanbol/enhancer/engines/dereference/entityhub/TrackingDereferencerBase.java
Thu Oct 29 11:42:07 2015
@@ -305,7 +305,7 @@ public abstract class TrackingDereferenc
(langs == null || langs.isEmpty())){
copyAll(uri, rep, graph, writeLock);
} else { //we need to apply some filters while dereferencing
- if(fieldMapper != null || !langs.isEmpty()){
+ if(fieldMapper != null || (langs != null && !langs.isEmpty())){
//this considers speficied fields and included languages
copyMapped(uri, rep, fieldMapper, langs, graph, writeLock);
}
