Use custom field for filename instead of exception message in Produce…

…rFileNotFoundException
tcurdt · Jan 5, 2025 · 8493601 · 8493601
1 parent 7983617
commit 8493601
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/main/java/org/vafer/jdeb/DataBuilder.java b/src/main/java/org/vafer/jdeb/DataBuilder.java
@@ -282,9 +282,9 @@ private void createParentDirectories( String filename, String user, long uid, St
                 data.produce(receiver);
             }
         } catch (ProducerFileNotFoundException e) {
-            // Get the offending file name from the exception message to check
+            // Get the offending file name from the exception to check
             // if it's a symlink.
-            if (Files.isSymbolicLink(Paths.get(e.getMessage())) && ignoreBrokenLinks) {
+            if (Files.isSymbolicLink(Paths.get(e.getFilePath())) && ignoreBrokenLinks) {
                 console.info("Ignoring broken symlink " + e.getMessage());
             }
             else {

diff --git a/src/main/java/org/vafer/jdeb/ProducerFileNotFoundException.java b/src/main/java/org/vafer/jdeb/ProducerFileNotFoundException.java
@@ -4,6 +4,7 @@
 
 public class ProducerFileNotFoundException extends FileNotFoundException {
 
+    private String filePath;
 
     public ProducerFileNotFoundException() {
         super();
@@ -17,4 +18,12 @@ public ProducerFileNotFoundException(String message, Throwable cause) {
         super(message);
         this.initCause(cause);
     }
+
+    public void setFilePath(String path) {
+        this.filePath = path;
+    }
+
+    public String getFilePath() {
+        return this.filePath;
+    }
 }
diff --git a/src/main/java/org/vafer/jdeb/producers/AbstractDataProducer.java b/src/main/java/org/vafer/jdeb/producers/AbstractDataProducer.java
@@ -91,7 +91,8 @@ public void produceFile( final DataConsumer consumer,
             Producers.produceInputStreamWithEntry(consumer, new FileInputStream(file), fileEntry);
         }
         catch (FileNotFoundException e) {
-            ProducerFileNotFoundException pe = new ProducerFileNotFoundException(file.getAbsolutePath(), e);
+            ProducerFileNotFoundException pe = new ProducerFileNotFoundException(e.getMessage(), e);
+            pe.setFilePath(file.getAbsolutePath());
             throw pe;
         }
     }