[jboss-cvs] JBossAS SVN: r109643 - trunk/webservices/src/main/java/org/jboss/webservices/integration/injection.

[jboss-cvs-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2010-12-02 05:33:49 -0500 (Thu, 02 Dec 2010)
New Revision: 109643

Modified:
   trunk/webservices/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java
Log:
[JBAS-8694] fixing TCK6 regression

Modified: trunk/webservices/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java
===================================================================
--- trunk/webservices/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java	2010-12-02 06:11:57 UTC (rev 109642)
+++ trunk/webservices/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java	2010-12-02 10:33:49 UTC (rev 109643)
@@ -144,18 +144,18 @@
     */
    private UnifiedVirtualFile getUnifiedVirtualFile(final DeploymentUnit deploymentUnit)
    {
-      DeploymentUnit du = deploymentUnit;
-      while (du.isComponent())
-         du = du.getParent();
+      DeploymentUnit tempDeploymentUnit = deploymentUnit;
+      while (tempDeploymentUnit.isComponent())
+         tempDeploymentUnit = tempDeploymentUnit.getParent();
 
-      if (du instanceof VFSDeploymentUnit)
+      if (tempDeploymentUnit instanceof VFSDeploymentUnit)
       {
-         VFSDeploymentUnit vdu = (VFSDeploymentUnit) du;
+         VFSDeploymentUnit vdu = (VFSDeploymentUnit) tempDeploymentUnit;
          return new VirtualFileAdaptor(vdu.getRoot());
       }
       else
       {
-         throw new IllegalArgumentException("Can only handle real VFS deployments: " + du);
+         throw new IllegalArgumentException("Can only handle real VFS deployments: " + tempDeploymentUnit);
       }
    }
 
@@ -197,7 +197,12 @@
       if (serviceRefSBMD.getInjectionTargets() != null && serviceRefSBMD.getInjectionTargets().size() > 0)
       {
          if (serviceRefSBMD.getInjectionTargets().size() > 1)
-            throw new UnsupportedOperationException("What to do in such case?");
+         {
+            // TODO: We should validate all the injection targets whether they're compatible.
+            // This means all the injection targets must be assignable or equivalent.
+            // If there are @Addressing, @RespectBinding or @MTOM annotations present on injection targets,
+            // these annotations must be equivalent for all the injection targets.
+         }
          final InjectionTarget injectionTarget = serviceRefSBMD.getInjectionTargets().iterator().next();
 
          AccessibleObject anAlement = this.findInjectionTarget(loader, injectionTarget);