[jboss-cvs] JBossAS SVN: r109398 - projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/connectionmanager.

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

Author: jaikiran
Date: 2010-11-21 11:10:54 -0500 (Sun, 21 Nov 2010)
New Revision: 109398

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/connectionmanager/CachedConnectionInterceptorFactory.java
Log:
EJBTHREE-2201 Add a safeguard against a null or empty jndi name

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/connectionmanager/CachedConnectionInterceptorFactory.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/connectionmanager/CachedConnectionInterceptorFactory.java	2010-11-21 15:14:15 UTC (rev 109397)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/connectionmanager/CachedConnectionInterceptorFactory.java	2010-11-21 16:10:54 UTC (rev 109398)
@@ -49,15 +49,25 @@
          for(ResourceReferenceMetaData resRef : resRefs)
          {
             String jndiName = resRef.getJndiName();
-            if(jndiName == null)
+            if(jndiName == null || jndiName.isEmpty())
                jndiName = resRef.getResolvedJndiName();
             // for res-url resources
-            if(jndiName == null)
+            if(jndiName == null || jndiName.isEmpty())
                continue;
             int i = jndiName.indexOf(':');
-            if(jndiName.charAt(i + 1) == '/')
-               i++;
-            unsharableResources.add(jndiName.substring(i + 1));
+            if (i != -1)
+            {
+               if(jndiName.charAt(i + 1) == '/')
+               {
+                  i++;
+               }
+               
+               unsharableResources.add(jndiName.substring(i + 1));
+            }
+            else
+            {
+               unsharableResources.add(jndiName);
+            }
          }
       }
       return new CachedConnectionInterceptor(unsharableResources);