Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correcting test error with closed writer stream. 

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@578279 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joakim Erdfelt 2007-09-21 21:23:48 +00:00
parent 07eb1d818e
commit af7ab9cdbb
2 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataWriter.java
View File

@ -97,7 +97,7 @@ public class RepositoryMetadataWriter
if ( CollectionUtils.isNotEmpty( metadata.getAvailableVersions() ) )
{
Element versions = versioning.addElement( "versions" );
Iterator it = metadata.getAvailableVersions().iterator();
Iterator<String> it = metadata.getAvailableVersions().iterator();
while ( it.hasNext() )
{
String version = (String) it.next();

55
archiva-base/archiva-xml-tools/src/main/java/org/apache/maven/archiva/xml/XMLWriter.java
View File

@ -1,22 +1,18 @@
package org.apache.maven.archiva.xml;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
* agreements. See the NOTICE file distributed with this work for additional information regarding
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
import org.dom4j.Document;
@ -26,18 +22,39 @@ import java.io.IOException;
import java.io.Writer;
/**
* XMLWriter
* XMLWriter - Making writing XML files easier.
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @version $Id$
*/
public class XMLWriter
{
/**
* Write the Document to the provided Writer, leaving the Writer open.
*
* @param doc the document to write.
* @param writer the writer to write to.
* @throws XMLException if there was a problem writing the xml to the writer.
*/
public static void write( Document doc, Writer writer )
throws XMLException
{
write( doc, writer, false );
}
/**
* Write the Document to the provided Writer, with an option to close the writer upon completion.
*
* @param doc the document to write.
* @param writer the writer to write to.
* @param close true to close the writer on completion.
* @throws XMLException if there was a problem writing the xml to the writer.
*/
public static void write( Document doc, Writer writer, boolean close )
throws XMLException
{
org.dom4j.io.XMLWriter xmlwriter = null;
try
{
OutputFormat outputFormat = OutputFormat.createPrettyPrint();
@ -51,7 +68,7 @@ public class XMLWriter
}
finally
{
if( xmlwriter != null )
if ( close && ( xmlwriter != null ) )
{
try
{