TUSCANY-3924 - revert some of the previous changes. we need to look at whether we are interpreting the spec correctly

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1242718 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 6 deletions

diff --git a/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java b/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java
index f67ebe793c..a04ad3721a 100644
--- a/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java
+++ b/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java
@@ -83,8 +83,7 @@ public final class JavaIntrospectionHelper {
         if (clazz == null || clazz.isArray() || Object.class.equals(clazz)) {
             return fields;
         }
-        // TUSCANY-3924 - don't consider inherited fields
-        //fields = getAllPublicAndProtectedFields(clazz.getSuperclass(), fields, validating);
+        fields = getAllPublicAndProtectedFields(clazz.getSuperclass(), fields, validating);
 
         Field[] declaredFields = null;
 
@@ -137,8 +136,7 @@ public final class JavaIntrospectionHelper {
             return fields;
         }
 
-        // TUSCANY-3924 - don't consider inherited fields
-        //fields = getInjectableFields(clazz.getSuperclass(), fields, validating);
+        fields = getInjectableFields(clazz.getSuperclass(), fields, validating);
 
         Field[] declaredFields = null;
 
@@ -237,8 +235,7 @@ public final class JavaIntrospectionHelper {
         }
         // evaluate class hierarchy - this is done last to track inherited
         // methods
-        // TUSCANY-3924 - don't consider inherited fields
-        //methods = getAllUniqueMethods(pClass.getSuperclass(), methods, validating);
+        methods = getAllUniqueMethods(pClass.getSuperclass(), methods, validating);
         return methods;
     }