svn commit: r1741623 - /aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java

[gnodet]

Author: gnodet
Date: Fri Apr 29 12:44:36 2016
New Revision: 1741623

URL: http://svn.apache.org/viewvc?rev=1741623&view=rev
Log:
[ARIES-1540] Blueprint NamespaceHandler can't resolve XSD in offline mode

Modified:
    
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java

Modified: 
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java?rev=1741623&r1=1741622&r2=1741623&view=diff
==============================================================================
--- 
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java
 Fri Apr 29 12:44:36 2016
@@ -541,16 +541,20 @@ public class NamespaceHandlerRegistryImp
                         }
                     }
                     // Find a compatible namespace handler
-                    LOGGER.warn("Dynamically adding namespace handler {} to 
bundle {}/{}",
-                            nsUri, bundle.getSymbolicName(), 
bundle.getVersion());
                     h = findCompatibleNamespaceHandler(nsUri);
                     if (h != null) {
-                        URL url = h.getSchemaLocation(rid);
+                        URL url = h.getSchemaLocation(namespaceURI);
+                        if (url == null) {
+                            url = h.getSchemaLocation(rid);
+                        }
                         if (isCorrectUrl(url)) {
+                            LOGGER.warn("Dynamically adding namespace handler 
{} to bundle {}/{}",
+                                    nsUri, bundle.getSymbolicName(), 
bundle.getVersion());
                             return createLSInput(url, id, namespaceURI);
                         }
                     }
                 }
+                LOGGER.warn("Unable to find namespace handler for {}", 
namespaceURI);
                 return null;
             }