Return-Path: 
 <commits-return-53851-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 4268 invoked from network); 22 Apr 2008 07:00:53 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 22 Apr 2008 07:00:53 -0000
Received: (qmail 9824 invoked by uid 500); 22 Apr 2008 07:00:52 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 9808 invoked by uid 500); 22 Apr 2008 07:00:52 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 9789 invoked by uid 99); 22 Apr 2008 07:00:52 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Apr 2008 00:00:52 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Apr 2008 07:00:17 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 457391A9832; Tue, 22 Apr 2008 00:00:30 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r650389 -
 /harmony/enhanced/buildtest/trunk/infra/scripts/cc-exec-adaptor.xml
Date: Tue, 22 Apr 2008 07:00:29 -0000
To: commits@harmony.apache.org
From: smishura@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080422070030.457391A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: smishura
Date: Tue Apr 22 00:00:02 2008
New Revision: 650389

URL: http://svn.apache.org/viewvc?rev=650389&view=rev
Log:
Fix condition to make it work with ANT 1.7

Modified:
    harmony/enhanced/buildtest/trunk/infra/scripts/cc-exec-adaptor.xml

Modified: harmony/enhanced/buildtest/trunk/infra/scripts/cc-exec-adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/scripts/cc-exec-adaptor.xml?rev=650389&r1=650388&r2=650389&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/scripts/cc-exec-adaptor.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/scripts/cc-exec-adaptor.xml Tue Apr 22 00:00:02 2008
@@ -218,9 +218,18 @@
             </propertyset>
         </ant>
         
-        <condition property="upload.dir" value="${framework.parameters.optional.upload.dir}">
-            <isset property="framework.parameters.optional.upload.dir"/>
+        <condition property="upload.dir"
+                   value="${framework.parameters.optional.upload.dir}">
+            <and>
+                <isset property="framework.parameters.optional.upload.dir" />
+
+                <!-- workaround: ANT 1.7 XmlProperty task sets empty value -->
+                <length string="${framework.parameters.optional.upload.dir}"
+                        when="greater"
+                        length="0" />
+            </and>
         </condition>
+
         <propertycopy property="skip.upload" from="${suite.name}.parameters.cc.skip.upload" silent="true"/>
         <runtarget target="upload-status-report"/>