From cec3132338ab56520316f96945a7604daebfbf05 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Wed, 19 Sep 2007 18:34:12 +0000 Subject: [PATCH] fixed NPE. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@4814 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/matrix/MatrixConfiguration.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/matrix/MatrixConfiguration.java b/core/src/main/java/hudson/matrix/MatrixConfiguration.java index 58d20d212b..b8aef2c8db 100644 --- a/core/src/main/java/hudson/matrix/MatrixConfiguration.java +++ b/core/src/main/java/hudson/matrix/MatrixConfiguration.java @@ -85,7 +85,9 @@ public class MatrixConfiguration extends Project public FilePath getWorkspace() { Node node = getLastBuiltOn(); if(node==null) node = Hudson.getInstance(); - return node.getWorkspaceFor(getParent()).child(getCombination().toString('/','/')); + FilePath ws = node.getWorkspaceFor(getParent()); + if(ws==null) return null; + return ws.child(getCombination().toString('/','/')); } @Override