From 5ccd2bcf7348406df494d1197cfe8745e9127cdd Mon Sep 17 00:00:00 2001
From: Conor MacNeill <conor@apache.org>
Date: Wed, 6 Dec 2000 12:12:47 +0000
Subject: [PATCH] Throw a BuildException when an attempt is made to use a
 property which has not been set. Any build files which rely on non-set
 properties being passed through untranslated will now break.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268322 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                         | 4 ++++
 src/main/org/apache/tools/ant/ProjectHelper.java | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index 779fff927..c74bc9d98 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -9,6 +9,10 @@ Changes that could break older environments:
 
 * <perforce> has been replaced by a number of new tasks.
 
+* Ant now throws a BuildException when an attempt is made to use a property which has
+  not been set. Any build files which rely on non-set properties being passed
+  through untranslated will now break.
+
 Other changes:
 --------------
 
diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java
index 55fbfc1c1..0614f93e1 100644
--- a/src/main/org/apache/tools/ant/ProjectHelper.java
+++ b/src/main/org/apache/tools/ant/ProjectHelper.java
@@ -634,8 +634,12 @@ public class ProjectHelper {
                                              value );
                 }
                 String n=value.substring( pos+2, endName );
-                String v= (keys.containsKey(n)) ? (String) keys.get( n ) 
-                    : "${"+n+"}";
+                if (!keys.containsKey(n)) {
+                    throw new BuildException("Property ${" + n + "} has not been set");
+                }
+                
+                String v = (String) keys.get(n);
+                
                 //System.out.println("N: " + n + " " + " V:" + v);
                 sb.append( v );
                 prev=endName+1;