Author: nash
Date: Tue Aug 24 20:10:53 2010
New Revision: 988701
URL: http://svn.apache.org/viewvc?rev=988701&view=rev
Log:
Merge revision 951561 from trunk into the 1.6.1 branch
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ComponentDocumentProcessor.java
tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ComponentTypeDocumentProcessor.java
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ComponentDocumentProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ComponentDocumentProcessor.java?rev=988701&r1=988700&r2=988701&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ComponentDocumentProcessor.java
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ComponentDocumentProcessor.java
Tue Aug 24 20:10:53 2010
@@ -85,11 +85,13 @@ public class ComponentDocumentProcessor
}
- 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
}
- 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));
- }
+ }
+ }
}
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ComponentTypeDocumentProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ComponentTypeDocumentProcessor.java?rev=988701&r1=988700&r2=988701&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ComponentTypeDocumentProcessor.java
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/domain-search/src/main/java/org/apache/tuscany/sca/domain/search/impl/ComponentTypeDocumentProcessor.java
Tue Aug 24 20:10:53 2010
@@ -128,11 +128,13 @@ public class ComponentTypeDocumentProces
}
- 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));
+ }
}
}
