From 3b16d7e53418cb19a1a6f3a8e58ef2cf9dcef919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Euzenat?= <Jerome.Euzenat@inria.fr>
Date: Mon, 12 Jul 2010 21:17:52 +0000
Subject: [PATCH] - Treated retrieveAlignment when method extension is null
---
.../inrialpes/exmo/align/service/AServProtocolManager.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java b/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java
index d95e4770..c56f1887 100644
--- a/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java
+++ b/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java
@@ -274,8 +274,6 @@ public class AServProtocolManager {
// find and access o, o'
URI uri1 = null;
URI uri2 = null;
- Ontology onto1 = null;
- Ontology onto2 = null;
try {
uri1 = new URI(params.getProperty("onto1"));
uri2 = new URI(params.getProperty("onto2"));
@@ -285,7 +283,8 @@ public class AServProtocolManager {
Set<Alignment> alignments = alignmentCache.getAlignments( uri1, uri2 );
if ( alignments != null && params.getProperty("force") == null ) {
for ( Alignment al: alignments ){
- if ( al.getExtension( Namespace.ALIGNMENT.uri, Annotations.METHOD ).equals(method) ) {
+ String meth2 = al.getExtension( Namespace.ALIGNMENT.uri, Annotations.METHOD );
+ if ( meth2 != null && meth2.equals(method) ) {
return new AlignmentId(newId(),mess,myId,mess.getSender(),
al.getExtension( Namespace.ALIGNMENT.uri, Annotations.ID ),(Properties)null,
al.getExtension( Namespace.ALIGNMENT.uri, Annotations.PRETTY ) );
--
GitLab