summaryrefslogtreecommitdiff
path: root/java/src/Ice/PropertiesI.java
diff options
context:
space:
mode:
Diffstat (limited to 'java/src/Ice/PropertiesI.java')
-rw-r--r--java/src/Ice/PropertiesI.java37
1 files changed, 31 insertions, 6 deletions
diff --git a/java/src/Ice/PropertiesI.java b/java/src/Ice/PropertiesI.java
index 30f711f884e..c562715b457 100644
--- a/java/src/Ice/PropertiesI.java
+++ b/java/src/Ice/PropertiesI.java
@@ -36,7 +36,14 @@ public final class PropertiesI implements Properties
PropertyValue pv = _properties.get(key);
if(pv == null)
{
- result = System.getProperty(key, "");
+ try
+ {
+ result = System.getProperty(key, "");
+ }
+ catch(java.lang.SecurityException ex)
+ {
+ result = "";
+ }
}
else
{
@@ -53,7 +60,14 @@ public final class PropertiesI implements Properties
PropertyValue pv = _properties.get(key);
if(pv == null)
{
- result = System.getProperty(key, value);
+ try
+ {
+ result = System.getProperty(key, value);
+ }
+ catch(java.lang.SecurityException ex)
+ {
+ result = value;
+ }
}
else
{
@@ -76,7 +90,13 @@ public final class PropertiesI implements Properties
PropertyValue pv = _properties.get(key);
if(pv == null)
{
- result = System.getProperty(key);
+ try
+ {
+ result = System.getProperty(key);
+ }
+ catch(java.lang.SecurityException ex)
+ {
+ }
}
else
{
@@ -118,7 +138,13 @@ public final class PropertiesI implements Properties
PropertyValue pv = _properties.get(key);
if(pv == null)
{
- result = System.getProperty(key);
+ try
+ {
+ result = System.getProperty(key);
+ }
+ catch(java.lang.SecurityException ex)
+ {
+ }
if(result == null)
{
return value;
@@ -621,9 +647,8 @@ public final class PropertiesI implements Properties
value = "";
}
}
- catch(SecurityException ex)
+ catch(java.lang.SecurityException ex)
{
- Ice.Util.getProcessLogger().warning("unable to access ICE_CONFIG environment variable");
value = "";
}
}