svn commit: r659154 - in /hadoop/core/trunk: CHANGES.txt src/java/org/apache/hadoop/conf/Configuration.java

[omalley]

Author: omalley
Date: Thu May 22 09:51:13 2008
New Revision: 659154

URL: http://svn.apache.org/viewvc?rev=659154&view=rev
Log:
HADOOP-3259. Makes failure to read system properties due to a
security manager non-fatal. Contributed by Edward Yoon.

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/java/org/apache/hadoop/conf/Configuration.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=659154&r1=659153&r2=659154&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Thu May 22 09:51:13 2008
@@ -327,6 +327,9 @@
     checking results to make the test more reliable. (Lohit Vijaya
     Renu via omalley)
 
+    HADOOP-3259. Makes failure to read system properties due to a
+    security manager non-fatal. (Edward Yoon via omalley)
+
 Release 0.17.0 - 2008-05-18
 
   INCOMPATIBLE CHANGES

Modified: hadoop/core/trunk/src/java/org/apache/hadoop/conf/Configuration.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/trunk/src/java/org/apache/hadoop/conf/Configuration.java?rev=659154&r1=659153&r2=659154&view=diff
==============================================================================
--- hadoop/core/trunk/src/java/org/apache/hadoop/conf/Configuration.java 
(original)
+++ hadoop/core/trunk/src/java/org/apache/hadoop/conf/Configuration.java Thu 
May 22 09:51:13 2008
@@ -244,7 +244,12 @@
       }
       String var = match.group();
       var = var.substring(2, var.length()-1); // remove ${ .. }
-      String val = System.getProperty(var);
+      String val = null;
+      try {
+        val = System.getProperty(var);
+      } catch(SecurityException se) {
+        LOG.warn("Unexpected SecurityException in Configuration", se);
+      }
       if (val == null) {
         val = getRaw(var);
       }