[jboss-cvs] JBossAS SVN: r77346 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection.

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

Author: emuckenhuber
Date: 2008-08-22 06:03:10 -0400 (Fri, 22 Aug 2008)
New Revision: 77346

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebResourceHandler.java
Log:
[JBAS-5673] don't create a urlInjector for a link

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebResourceHandler.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebResourceHandler.java	2008-08-22 09:16:50 UTC (rev 77345)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebResourceHandler.java	2008-08-22 10:03:10 UTC (rev 77346)
@@ -96,7 +96,7 @@
          }
          catch (MalformedURLException e)
          {
-            throw new RuntimeException(e);
+            throw new RuntimeException("failed to create url injector for: "+ encName, e);
          }
       }
       
@@ -172,9 +172,9 @@
                   throw new RuntimeException("mapped-name is required for " + envRef.getResourceRefName() + " of deployment " + container.getIdentifier());
                }
             }
-            else if(URL.class.getName().equals(envRef.getType()))
+            else if(URL.class.getName().equals(envRef.getType()) && ! mappedName.startsWith("java:") )
             {
-               createURLInjector(encName, envRef.getMappedName(), container);
+               createURLInjector(encName, mappedName, container);
                InjectionUtil.injectionTarget(encName, envRef, container, container.getEncInjections());
                continue;
             }