From 4829434a7343a260a8b63f2fed7bdfd27303000d Mon Sep 17 00:00:00 2001
From: Stephane Bailliez <sbailliez@apache.org>
Date: Mon, 11 Feb 2002 22:48:28 +0000
Subject: [PATCH] Fix shouldRun logic.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271288 13f79535-47bb-0310-9956-ffa450edef68
---
 .../ant/taskdefs/optional/rjunit/BaseTestElement.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/BaseTestElement.java b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/BaseTestElement.java
index 42fd25e63..8f6ea15c4 100644
--- a/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/BaseTestElement.java
+++ b/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/BaseTestElement.java
@@ -105,8 +105,12 @@ public abstract class BaseTestElement
      */
     protected boolean shouldRun() {
         final Project project = getProject();
-        if ((project.getProperty(ifProperty) == null) ||
-                (project.getProperty(unlessProperty) != null)) {
+        if ( ifProperty != null &&
+                project.getProperty(ifProperty) == null ){
+            return false;
+        }
+        if (unlessProperty != null &&
+                project.getProperty(unlessProperty) != null) {
             return false;
         }
         return true;