svn commit: r589717 - in /incubator/cxf/branches/2.0.x-fixes: ./ common/common/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java

[dkulp]

Author: dkulp
Date: Mon Oct 29 09:19:57 2007
New Revision: 589717

URL: http://svn.apache.org/viewvc?rev=589717&view=rev
Log:
Merged revisions 589533 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r589533 | ningjiang | 2007-10-29 03:36:56 -0400 (Mon, 29 Oct 2007) | 1 line
  
  Quick fix for my last commit
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    
incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java?rev=589717&r1=589716&r2=589717&view=diff
==============================================================================
--- 
incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java
 (original)
+++ 
incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java
 Mon Oct 29 09:19:57 2007
@@ -35,7 +35,7 @@
     }
  
     public <T> T resolve(String resourceName, Class<T> resourceType) {
-        if (resourceName == null) {
+        if (resourceName == null || resourceType == null) {
             return null;
         }
         URL url = loader.getResource(resourceName);