From 255c829b598a7a3151489e7121c56b219e530777 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Fri, 4 Feb 2022 12:19:44 +0100
Subject: Force Unix line endings for Libvirt XML files (even on Windows
 platforms)

---
 src/main/java/org/openslx/libvirt/xml/LibvirtXmlDocument.java          | 3 +--
 .../virtualization/configuration/VirtualizationConfigurationQemu.java  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/org/openslx/libvirt/xml/LibvirtXmlDocument.java b/src/main/java/org/openslx/libvirt/xml/LibvirtXmlDocument.java
index f24ba4f..97180e3 100644
--- a/src/main/java/org/openslx/libvirt/xml/LibvirtXmlDocument.java
+++ b/src/main/java/org/openslx/libvirt/xml/LibvirtXmlDocument.java
@@ -312,7 +312,7 @@ public abstract class LibvirtXmlDocument implements LibvirtXmlSerializable, Libv
 			DOMSource source = new DOMSource( this.xmlDocument );
 			StreamResult xmlString = new StreamResult( xmlWriter );
 			this.xmlTransformer.transform( source, xmlString );
-			xml = xmlWriter.toString() + System.lineSeparator();
+			xml = xmlWriter.toString();
 			xmlWriter.close();
 		} catch ( TransformerException | IOException e ) {
 			throw new LibvirtXmlSerializationException( e.getLocalizedMessage() );
@@ -337,7 +337,6 @@ public abstract class LibvirtXmlDocument implements LibvirtXmlSerializable, Libv
 			DOMSource source = new DOMSource( this.xmlDocument );
 			StreamResult xmlStream = new StreamResult( xmlWriter );
 			this.xmlTransformer.transform( source, xmlStream );
-			xmlWriter.append( System.lineSeparator() );
 			xmlWriter.close();
 		} catch ( TransformerException | IOException e ) {
 			throw new LibvirtXmlSerializationException( e.getLocalizedMessage() );
diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java
index ced9160..7082e27 100644
--- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java
+++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java
@@ -746,7 +746,7 @@ public class VirtualizationConfigurationQemu extends VirtualizationConfiguration
 			return null;
 		} else {
 			// append newline at the end of the XML content to match the structure of an original Libvirt XML file
-			configuration += System.lineSeparator();
+			//configuration += LibvirtXmlDocument.LINE_SEPARATOR;
 			return configuration.getBytes( StandardCharsets.UTF_8 );
 		}
 	}
-- 
cgit v1.2.3-55-g7522