Mirrors/Stirling-PDF
Mirrors/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Frooodle/Stirling-PDF.git synced 2025-09-12 17:52:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix template resolver and listener bugs

Browse Source
This commit is contained in:
Anthony Stirling 2025-05-20 07:45:00 +01:00
parent e6a9e7a584
commit d943262dc6
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/stirling/software/SPDF/LibreOfficeListener.java
View File

@ -31,7 +31,8 @@ public class LibreOfficeListener {
log.info("waiting for listener to start"); log.info("waiting for listener to start");
try (Socket socket = new Socket()) { try (Socket socket = new Socket()) {
socket.connect( socket.connect(
new InetSocketAddress("localhost", 2002), 1000); // Timeout after 1 second new InetSocketAddress("localhost", LISTENER_PORT),
1000); // Timeout after 1 second
return true; return true;
} catch (Exception e) { } catch (Exception e) {
return false; return false;

6
src/main/java/stirling/software/SPDF/config/FileFallbackTemplateResolver.java
View File

@ -11,8 +11,11 @@ import org.thymeleaf.templateresolver.AbstractConfigurableTemplateResolver;
import org.thymeleaf.templateresource.FileTemplateResource; import org.thymeleaf.templateresource.FileTemplateResource;
import org.thymeleaf.templateresource.ITemplateResource; import org.thymeleaf.templateresource.ITemplateResource;
import lombok.extern.slf4j.Slf4j;
import stirling.software.SPDF.model.InputStreamTemplateResource; import stirling.software.SPDF.model.InputStreamTemplateResource;
@Slf4j
public class FileFallbackTemplateResolver extends AbstractConfigurableTemplateResolver { public class FileFallbackTemplateResolver extends AbstractConfigurableTemplateResolver {
private final ResourceLoader resourceLoader; private final ResourceLoader resourceLoader;
@ -40,7 +43,8 @@ public class FileFallbackTemplateResolver extends AbstractConfigurableTemplateRe
return new FileTemplateResource(resource.getFile().getPath(), characterEncoding); return new FileTemplateResource(resource.getFile().getPath(), characterEncoding);
} }
} catch (IOException e) { } catch (IOException e) {
// Log the exception to help with debugging issues loading external templates
log.warn("Unable to read template from file system", e);
} }
InputStream inputStream = InputStream inputStream =

3
src/main/java/stirling/software/SPDF/model/InputStreamTemplateResource.java
View File

@ -39,7 +39,6 @@ public class InputStreamTemplateResource implements ITemplateResource {
@Override @Override
public boolean exists() { public boolean exists() {
// TODO Auto-generated method stub return inputStream != null;
return false;
} }
} }