aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/org/apache/fop
diff options
context:
space:
mode:
authorJeremias Maerki <jeremias@apache.org>2006-06-14 07:54:01 +0000
committerJeremias Maerki <jeremias@apache.org>2006-06-14 07:54:01 +0000
commitfec95ada84116b3e29672c8d863604874bf49550 (patch)
tree20a18c4a4bca3e4a8f9ebbd6f8dbf894300d2465 /src/java/org/apache/fop
parented8a0386c6e8e3b9a87ff74ab25af2e69b4e6b44 (diff)
downloadxmlgraphics-fop-fec95ada84116b3e29672c8d863604874bf49550.tar.gz
xmlgraphics-fop-fec95ada84116b3e29672c8d863604874bf49550.zip
Bugzilla #39809:
Fixed NullPointerException when there's no user configuration file for the FOP Ant task. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@414137 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop')
-rw-r--r--src/java/org/apache/fop/tools/anttasks/Fop.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/java/org/apache/fop/tools/anttasks/Fop.java b/src/java/org/apache/fop/tools/anttasks/Fop.java
index 895230d27..0634c0407 100644
--- a/src/java/org/apache/fop/tools/anttasks/Fop.java
+++ b/src/java/org/apache/fop/tools/anttasks/Fop.java
@@ -338,7 +338,9 @@ class FOPTaskStarter {
FOPTaskStarter(Fop task) throws SAXException, IOException {
this.task = task;
- fopFactory.setUserConfig(task.getUserconfig());
+ if (task.getUserconfig() != null) {
+ fopFactory.setUserConfig(task.getUserconfig());
+ }
}
private static final String[][] SHORT_NAMES = {