Repository: karaf Updated Branches: refs/heads/master a4c19f319 -> 0deee4e63
[KARAF-3712] Additional fixes in the xml parser / repository Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0deee4e6 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0deee4e6 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0deee4e6 Branch: refs/heads/master Commit: 0deee4e6354e56720fdb3ee90a82ced2bc038c2c Parents: a4c19f3 Author: Guillaume Nodet <[email protected]> Authored: Tue May 5 10:13:38 2015 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Tue May 5 10:13:38 2015 +0200 ---------------------------------------------------------------------- .../apache/karaf/features/internal/repository/StaxParser.java | 5 +++-- .../karaf/features/internal/repository/XmlRepository.java | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/0deee4e6/features/core/src/main/java/org/apache/karaf/features/internal/repository/StaxParser.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/repository/StaxParser.java b/features/core/src/main/java/org/apache/karaf/features/internal/repository/StaxParser.java index c320598..2811297 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/repository/StaxParser.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/repository/StaxParser.java @@ -18,6 +18,7 @@ package org.apache.karaf.features.internal.repository; import java.io.InputStream; import java.io.OutputStreamWriter; +import java.io.Writer; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -84,7 +85,7 @@ public final class StaxParser { public List<Resource> resources = new ArrayList<>(); } - public static void write(XmlRepository repository, OutputStreamWriter os) throws XMLStreamException { + public static void write(XmlRepository repository, Writer os) throws XMLStreamException { XMLStreamWriter writer = getOutputFactory().createXMLStreamWriter(os); writer.writeStartDocument(); writer.setDefaultNamespace(REPOSITORY_NAMESPACE); @@ -192,7 +193,7 @@ public final class StaxParser { String attrValue = reader.getAttributeValue(i); switch (attrName) { case REPO_NAME: - repo.name = attrName; + repo.name = attrValue; break; case INCREMENT: repo.increment = Long.parseLong(attrValue); http://git-wip-us.apache.org/repos/asf/karaf/blob/0deee4e6/features/core/src/main/java/org/apache/karaf/features/internal/repository/XmlRepository.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/repository/XmlRepository.java b/features/core/src/main/java/org/apache/karaf/features/internal/repository/XmlRepository.java index 0cd3f9d..0ff574e 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/repository/XmlRepository.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/repository/XmlRepository.java @@ -44,9 +44,9 @@ import static org.osgi.framework.namespace.IdentityNamespace.IDENTITY_NAMESPACE; */ public class XmlRepository extends BaseRepository { - final String url; - final Map<String, XmlLoader> loaders = new HashMap<String, XmlLoader>(); - final ReadWriteLock lock = new ReentrantReadWriteLock(); + protected final String url; + protected final Map<String, XmlLoader> loaders = new HashMap<String, XmlLoader>(); + protected final ReadWriteLock lock = new ReentrantReadWriteLock(); public XmlRepository(String url) { this.url = url;
