From 482b1f5e984ec3f76cfb176e6dd8e98d604dbb78 Mon Sep 17 00:00:00 2001
From: Nicolas Guillouet <nicolas@meaningengines.com>
Date: Thu, 20 Mar 2014 14:22:41 +0000
Subject: [PATCH] Fix NullPointerException on translateMessage
---
src/fr/inrialpes/exmo/align/impl/BasicAlignment.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java b/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java
index fb45f5ea..8657fc7c 100644
--- a/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java
@@ -59,7 +59,7 @@ import fr.inrialpes.exmo.ontowrap.OntowrapException;
* In version 3.0 this class is virtually abstract.
* But it cannot be declared abstract because it uses its own constructor.
*
- * @author Jérôme Euzenat, David Loup, Raphaël Troncy
+ * @author Jérôme Euzenat, David Loup, Raphaël Troncy
* @version $Id$
*/
@@ -830,7 +830,7 @@ public class BasicAlignment implements Alignment {
for ( Map.Entry<Object,Object> m : prefix.entrySet() ) {
if ( m.getKey() != null ) {
mainQuery = Pattern.compile("<"+m.getValue()+"([A-Za-z0-9_-]+)>").matcher(mainQuery).replaceAll( m.getKey()+":$1" );
- mainQuery = "PREFIX "+m.getKey()+": <"+m.getValue()+"> .\n" + mainQuery;
+ mainQuery = "PREFIX "+m.getKey()+": <"+m.getValue()+"> \n" + mainQuery;
}
}
@@ -843,8 +843,12 @@ public class BasicAlignment implements Alignment {
try {
// The second part replaces the named items by their counterparts
for( Cell cell : this ){
+ URI uri1 = cell.getObject1AsURI(this);
+ URI uri2 = cell.getObject2AsURI(this);
+ if(uri1 != null && uri2 != null){
result = result.replaceAll( cell.getObject1AsURI(this).toString(),
cell.getObject2AsURI(this).toString() );
+ }
}
} catch (AlignmentException alex) {
logger.debug( "IGNORED AlignmentException {}", alex );
--
GitLab