svn commit: r1489245 - in /oozie/trunk: core/src/test/java/org/apache/oozie/command/coord/TestCoordELExtensions.java core/src/test/java/org/apache/oozie/test/XTestCase.java release-log.txt

[ro...@apache.org]

Author: rohini
Date: Tue Jun  4 00:25:19 2013
New Revision: 1489245

URL: http://svn.apache.org/r1489245
Log:
OOZIE-1397 failure in running test cases (aklochkov via rohini)

Modified:
    oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordELExtensions.java
    oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java
    oozie/trunk/release-log.txt

Modified: oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordELExtensions.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordELExtensions.java?rev=1489245&r1=1489244&r2=1489245&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordELExtensions.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordELExtensions.java Tue Jun  4 00:25:19 2013
@@ -19,7 +19,6 @@
 
 import java.io.File;
 import java.util.Date;
-import java.util.HashMap;
 
 import org.apache.oozie.CoordinatorActionBean;
 import org.apache.oozie.CoordinatorJobBean;
@@ -38,7 +37,6 @@ public class TestCoordELExtensions exten
 
     @Override
     protected void setUp() throws Exception {
-        sysProps = new HashMap<String, String>();
         setSystemProperty("oozie.test.config.file", new File(OOZIE_SRC_DIR,
                 "core/src/test/resources/oozie-site-coordel.xml").getAbsolutePath());
         super.setUp();
@@ -79,4 +77,4 @@ public class TestCoordELExtensions exten
         }
         return null;
     }
-}
\ No newline at end of file
+}

Modified: oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java?rev=1489245&r1=1489244&r2=1489245&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java Tue Jun  4 00:25:19 2013
@@ -91,7 +91,7 @@ import org.apache.oozie.util.XLog;
  * From within testcases, system properties must be changed using the {@link #setSystemProperty} method.
  */
 public abstract class XTestCase extends TestCase {
-    protected Map<String, String> sysProps;
+    private Map<String, String> sysProps;
     private String testCaseDir;
     private String testCaseConfDir;
     private String hadoopVersion;
@@ -261,7 +261,6 @@ public abstract class XTestCase extends 
             System.exit(-1);
         }
         hadoopVersion = System.getProperty(HADOOP_VERSION, "0.20.0");
-        sysProps = new HashMap<String, String>();
         testCaseDir = createTestCaseDir(this, true);
 
         //setting up Oozie HOME and Oozie conf directory
@@ -516,6 +515,9 @@ public abstract class XTestCase extends 
      * @param value value to set.
      */
     protected void setSystemProperty(String name, String value) {
+        if (sysProps == null) {
+            sysProps = new HashMap<String, String>();
+        }
         if (!sysProps.containsKey(name)) {
             String currentValue = System.getProperty(name);
             sysProps.put(name, currentValue);
@@ -532,15 +534,17 @@ public abstract class XTestCase extends 
      * Reset changed system properties to their original values. <p/> Called from {@link #tearDown}.
      */
     private void resetSystemProperties() {
-        for (Map.Entry<String, String> entry : sysProps.entrySet()) {
-            if (entry.getValue() != null) {
-                System.setProperty(entry.getKey(), entry.getValue());
-            }
-            else {
-                System.getProperties().remove(entry.getKey());
+        if (sysProps != null) {
+            for (Map.Entry<String, String> entry : sysProps.entrySet()) {
+                if (entry.getValue() != null) {
+                    System.setProperty(entry.getKey(), entry.getValue());
+                }
+                else {
+                    System.getProperties().remove(entry.getKey());
+                }
             }
+            sysProps.clear();
         }
-        sysProps.clear();
     }
 
     /**

Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1489245&r1=1489244&r2=1489245&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Tue Jun  4 00:25:19 2013
@@ -1,5 +1,6 @@
 -- Oozie 4.1.0 release (trunk - unreleased)
 
+OOZIE-1397 failure in running test cases (aklochkov via rohini)
 OOZIE-1294 SLA Email Notification (ryota via virag)
 OOZIE-1395 Using Yarn's CapacityScheduler causes some tests to time out (rkanter)
 OOZIE-1373 Oozie compilation fails with jdk7 (tucu, rohini via rohini)