From e1fb8f449e55dc3645520504a67bc86e1eb85597 Mon Sep 17 00:00:00 2001 From: Fritz Elfert Date: Fri, 9 Oct 2015 10:40:34 +0200 Subject: [PATCH] Dedup code --- core/src/main/java/jenkins/model/Nodes.java | 35 +++++++++++---------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/core/src/main/java/jenkins/model/Nodes.java b/core/src/main/java/jenkins/model/Nodes.java index c581c2cad5..d8cfb75539 100644 --- a/core/src/main/java/jenkins/model/Nodes.java +++ b/core/src/main/java/jenkins/model/Nodes.java @@ -137,14 +137,24 @@ public class Nodes implements Saveable { jenkins.trimLabels(); } }); - // no need for a full save() so we just do the minimum - if (node instanceof EphemeralNode) { - Util.deleteRecursive(new File(getNodesDir(), node.getNodeName())); - } else { - XmlFile xmlFile = new XmlFile(Jenkins.XSTREAM, - new File(new File(getNodesDir(), node.getNodeName()), "config.xml")); - xmlFile.write(node); - } + persistNode(node); + } + } + + /** + * Actually persists a node on disk. + * + * @param node the node to be persisted. + * @throws IOException if the node could not be persisted. + */ + private void persistNode(final @Nonnull Node node) throws IOException { + // no need for a full save() so we just do the minimum + if (node instanceof EphemeralNode) { + Util.deleteRecursive(new File(getNodesDir(), node.getNodeName())); + } else { + XmlFile xmlFile = new XmlFile(Jenkins.XSTREAM, + new File(new File(getNodesDir(), node.getNodeName()), "config.xml")); + xmlFile.write(node); } } @@ -156,14 +166,7 @@ public class Nodes implements Saveable { */ public void updateNode(final @Nonnull Node node) throws IOException { if (node == nodes.get(node.getNodeName())) { - // no need for a full save() so we just do the minimum - if (node instanceof EphemeralNode) { - Util.deleteRecursive(new File(getNodesDir(), node.getNodeName())); - } else { - XmlFile xmlFile = new XmlFile(Jenkins.XSTREAM, - new File(new File(getNodesDir(), node.getNodeName()), "config.xml")); - xmlFile.write(node); - } + persistNode(node); } }