You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by xu...@apache.org on 2009/12/21 15:43:02 UTC

svn commit: r892838 - /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java

Author: xuhaihong
Date: Mon Dec 21 14:43:02 2009
New Revision: 892838

URL: http://svn.apache.org/viewvc?rev=892838&view=rev
Log:
Keep the same behavior with Tomcat's own context implementation, throw naming exception instead of returning null value

Modified:
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java?rev=892838&r1=892837&r2=892838&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java Mon Dec 21 14:43:02 2009
@@ -1450,7 +1450,7 @@
         }
         URL url = bundle.getEntry(name);
         if (url == null) {
-            return null;
+            throw new NamingException(sm.getString("resources.notFound", name));
         }
         return new URLResource(url);
     }