From a2c565fef743bb1d33596d9e505c019579207afa Mon Sep 17 00:00:00 2001
From: Daniel Quathamer <danielq@memtext.de>
Date: Fri, 29 Dec 2023 10:34:22 +0100
Subject: [PATCH] Avoid infinite loop if SxImport returns no Result #233363

(cherry picked from commit b6aebbc4155fdc439533b9bb0ce04ad878706868)
---
 src/de/superx/servlet/SxPool.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/de/superx/servlet/SxPool.java b/src/de/superx/servlet/SxPool.java
index 2447440..0d90902 100644
--- a/src/de/superx/servlet/SxPool.java
+++ b/src/de/superx/servlet/SxPool.java
@@ -1552,10 +1552,18 @@ public class SxPool extends GenericObjectPool implements NamedObjectI {
 					String importInstruction = work.substring(posstart + 10, posende );
 
 					ResultSet rs = stm.executeQuery(importInstruction);
+					boolean validReplaceText=false;
 					while (rs.next()) {
-						StringUtils.replace(work, "<sximport>" + importInstruction + "</sximport>", rs.getString(1));
+						validReplaceText=true;
+						String replaceText=rs.getString(1);
+						if(replaceText==null)
+							StringUtils.replace(work, "<sximport>" + importInstruction + "</sximport>", "");
+						else
+							StringUtils.replace(work, "<sximport>" + importInstruction + "</sximport>", replaceText);
 					}
 					rs.close();
+					if(!validReplaceText)
+						break;
 				}
 				stm.close();
 				dbConnection.close();