commit 551db013f01eaa6cf7540dfae5837115e312d9a5
author John Ross <jwross@apache.org> Wed Jun 15 19:09:55 2016 +0000
committer John Ross <jwross@apache.org> Wed Jun 15 19:09:55 2016 +0000
tree bb0b4dd9c7272470bafc4f85090a29e770cd0238
parent 759c55c54c94d261ef3b79f5b13238461fe89670

[ARIES-1574] Remove the reference to AutoCloseable in blueprint-core in order to maintain Java 1.6 compatibility.


git-svn-id: https://svn.apache.org/repos/asf/aries/trunk@1748619 13f79535-47bb-0310-9956-ffa450edef68

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

diff --git a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java
index 2a8b6dc..e184a24 100644
--- a/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java
+++ b/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java
@@ -18,6 +18,10 @@
  */
 package org.apache.aries.blueprint.namespace;
 
+import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI;
+import static javax.xml.XMLConstants.XML_NS_URI;
+import static org.apache.aries.blueprint.parser.Parser.BLUEPRINT_NAMESPACE;
+
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
@@ -44,6 +48,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CopyOnWriteArraySet;
+
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
@@ -63,10 +68,6 @@
 import org.w3c.dom.ls.LSResourceResolver;
 import org.xml.sax.SAXException;
 
-import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI;
-import static javax.xml.XMLConstants.XML_NS_URI;
-import static org.apache.aries.blueprint.parser.Parser.BLUEPRINT_NAMESPACE;
-
 /**
  * Default implementation of the NamespaceHandlerRegistry.
  * 
@@ -461,7 +462,7 @@
             return schema;
         }
 
-        private class Loader implements LSResourceResolver, AutoCloseable {
+        private class Loader implements LSResourceResolver, Closeable {
             final List<StreamSource> sources = new ArrayList<StreamSource>();
             final Map<String, URL> loaded = new HashMap<String, URL>();
             final Map<String, String> namespaces = new HashMap<String, String>();