commit 69e6cdce5174f978fcdd2ebd2ea1aeadf6e08432
author Zhaohui Feng <rfeng@apache.org> Mon Sep 10 22:14:52 2012 +0000
committer Zhaohui Feng <rfeng@apache.org> Mon Sep 10 22:14:52 2012 +0000
tree 944179877934bd4076af273ec9efd083119c3db2
parent e1f9f789665127a40424d145e9775cb2b5f966cd

Fix NPE as the autowire is Boolean and the value can be null. The autoboxing will throw NPE.

git-svn-id: https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk@1383128 13f79535-47bb-0310-9956-ffa450edef68

modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java

diff --git a/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java b/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
index 4ce163f..5118571 100644
--- a/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
+++ b/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
@@ -495,14 +495,15 @@
             } 
             
             // TUSCANY-4069 if no binding specified on reference then use service binding.sca if that exists 
-            if (endpointReference.getBinding() == null && endpointReference.getReference().getAutowire() == true){
-                for (Endpoint endpoint : matchedEndpoints){
-                    if (endpoint.getBinding() instanceof SCABinding){
+            if (endpointReference.getBinding() == null && Boolean.TRUE.equals(endpointReference.getReference()
+                .getAutowire())) {
+                for (Endpoint endpoint : matchedEndpoints) {
+                    if (endpoint.getBinding() instanceof SCABinding) {
                         matchedEndpoint = endpoint;
                         break;
                     }
                 }
-            } 
+            }
 
             if (matchedEndpoint == null) {
                 // just take the first matched endpoint from the list