diff options
| author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-06-04 20:39:35 +0000 |
|---|---|---|
| committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-06-04 20:39:35 +0000 |
| commit | ddb010b090f325cc73d89c2f34ceb0ba10810807 (patch) | |
| tree | d7032fe85a61eb1e3c07a674d3b237648ee772e4 /sca-java-1.x | |
| parent | ff55216af50623637566539c8277ac3fe950fb14 (diff) | |
Fix NullPointerException caused by missing tests for null callback interface (TUSCANY-3588)
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@951561 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x')
2 files changed, 16 insertions, 10 deletions
diff --git a/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ComponentDocumentProcessor.java b/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ComponentDocumentProcessor.java index 28099f055c..5e6cd54e67 100644 --- a/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ComponentDocumentProcessor.java +++ b/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ComponentDocumentProcessor.java @@ -85,11 +85,13 @@ public class ComponentDocumentProcessor implements DocumentProcessor { } - for (Operation operation : interfaceContract.getCallbackInterface().getOperations()) { + if (interfaceContract.getCallbackInterface() != null) { + for (Operation operation : interfaceContract.getCallbackInterface().getOperations()) { - serviceDoc.add(new Field(SearchFields.SERVICE_INTERFACE_CALLBACK_FIELD, - operation.getName(), Field.Store.YES, Field.Index.ANALYZED)); + serviceDoc.add(new Field(SearchFields.SERVICE_INTERFACE_CALLBACK_FIELD, + operation.getName(), Field.Store.YES, Field.Index.ANALYZED)); + } } } @@ -115,12 +117,14 @@ public class ComponentDocumentProcessor implements DocumentProcessor { } - for (Operation operation : interfaceContract.getCallbackInterface().getOperations()) { + if (interfaceContract.getCallbackInterface() != null) { + for (Operation operation : interfaceContract.getCallbackInterface().getOperations()) { - referenceDoc.add(new Field(SearchFields.REFERENCE_INTERFACE_CALLBACK_FIELD, operation - .getName(), Field.Store.YES, Field.Index.ANALYZED)); + referenceDoc.add(new Field(SearchFields.REFERENCE_INTERFACE_CALLBACK_FIELD, operation + .getName(), Field.Store.YES, Field.Index.ANALYZED)); - } + } + } } diff --git a/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ComponentTypeDocumentProcessor.java b/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ComponentTypeDocumentProcessor.java index 6c6f7e2194..20cc421d72 100644 --- a/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ComponentTypeDocumentProcessor.java +++ b/sca-java-1.x/trunk/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ComponentTypeDocumentProcessor.java @@ -128,11 +128,13 @@ public class ComponentTypeDocumentProcessor implements DocumentProcessor { } - for (Operation operation : interfaceContract.getCallbackInterface().getOperations()) { + if (interfaceContract.getCallbackInterface() != null) { + for (Operation operation : interfaceContract.getCallbackInterface().getOperations()) { - referenceDoc.add(new Field(SearchFields.REFERENCE_INTERFACE_CALLBACK_FIELD, operation - .getName(), Field.Store.YES, Field.Index.ANALYZED)); + referenceDoc.add(new Field(SearchFields.REFERENCE_INTERFACE_CALLBACK_FIELD, operation + .getName(), Field.Store.YES, Field.Index.ANALYZED)); + } } } |